From ecfae0dee8bcd9e8bd0828e0799f8ff8c227c8d9 Mon Sep 17 00:00:00 2001 From: kadiryazici Date: Sun, 17 Mar 2024 13:32:16 +0300 Subject: [PATCH] Add simpler handlig & Update eslint rules --- eslint.config.js | 4 + src/App.vue | 83 ++++++++++++- src/api/token.ts | 3 +- src/components/AppButton.vue | 7 +- src/components/AppScroller.vue | 3 +- src/components/AppSidebar.vue | 9 +- src/components/MenuItems.vue | 3 +- src/components/NotificationItem.vue | 10 +- src/components/Popover.vue | 3 +- src/components/Tooltip.vue | 3 +- src/composables/useAppHooks.ts | 21 ++++ src/composables/useCustomHook.ts | 9 +- src/composables/useElementNavigation.ts | 6 +- src/composables/useI18n.ts | 2 +- src/composables/useInterval.ts | 3 +- src/composables/useKey.ts | 25 ++-- src/composables/useRoute.ts | 3 +- src/composables/useSlotWithRef.ts | 6 +- src/composables/useTauriEvent.ts | 3 +- src/composables/useTheme.ts | 9 +- src/composables/useTimeoutPool.ts | 9 +- src/directives/contextmenu.ts | 3 +- src/main.ts | 9 +- src/pages/HomePage.vue | 147 ++++-------------------- src/pages/LandingPage.vue | 3 +- src/pages/SettingsPage.vue | 15 ++- src/storage.ts | 6 +- src/stores/store.ts | 85 ++++++++------ src/utils/api.ts | 3 +- src/utils/array.ts | 6 +- src/utils/batch.ts | 3 +- src/utils/github.ts | 6 +- src/utils/notification.ts | 3 +- src/utils/url.ts | 3 +- src/utils/wowerlay.ts | 3 +- 35 files changed, 295 insertions(+), 224 deletions(-) create mode 100644 src/composables/useAppHooks.ts diff --git a/eslint.config.js b/eslint.config.js index 3f1fb5a..dedde84 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -15,5 +15,9 @@ export default antfu({ max: 1, }, }], + // Require curly always for if statements + 'curly': ['error', 'all'], + // if else statements should be separated by a newline + 'brace-style': ['error', 'stroustrup', { allowSingleLine: false }], }, }) diff --git a/src/App.vue b/src/App.vue index 2a1dd13..b2e5ae1 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,6 @@ diff --git a/src/api/token.ts b/src/api/token.ts index 1520670..5180ea3 100644 --- a/src/api/token.ts +++ b/src/api/token.ts @@ -31,8 +31,9 @@ export async function getAccessToken({ clientId, clientSecret, code }: GetAccess responseType: ResponseType.JSON, }) - if (!res.ok) + if (!res.ok) { throw res + } return res } diff --git a/src/components/AppButton.vue b/src/components/AppButton.vue index 82f7a31..c12d475 100644 --- a/src/components/AppButton.vue +++ b/src/components/AppButton.vue @@ -17,13 +17,14 @@ const props = withDefaults(defineProps(), { const emit = defineEmits() defineSlots<{ - default: (props: {}) => any - icon: (props: {}) => any + default: (props: Record) => any + icon: (props: Record) => any }>() function handleClick(e: MouseEvent) { - if (props.loading) + if (props.loading) { return + } emit('click', e) } diff --git a/src/components/AppScroller.vue b/src/components/AppScroller.vue index 635d9c6..6b7ae0d 100644 --- a/src/components/AppScroller.vue +++ b/src/components/AppScroller.vue @@ -24,8 +24,9 @@ watch(route.currentPage, () => { focus() const element = scrollView.value?.osInstance()?.elements().scrollOffsetElement - if (element) + if (element) { element.scrollTop = 0 + } }, { flush: 'post' }) const { theme } = useTheme() diff --git a/src/components/AppSidebar.vue b/src/components/AppSidebar.vue index ae4634a..055e6b5 100644 --- a/src/components/AppSidebar.vue +++ b/src/components/AppSidebar.vue @@ -1,7 +1,7 @@