From ee8c543cd93925d99eb8eabdbbdb3deb44a86c10 Mon Sep 17 00:00:00 2001 From: Jesse Wierzbinski Date: Sat, 7 Dec 2024 13:46:19 +0100 Subject: [PATCH] refactor: :fire: Clean up codebase --- app.vue | 10 ++- components/buttons/button-dropdown.vue | 22 ------- components/buttons/button-mobile-navbar.vue | 15 ----- components/dropdowns/AdaptiveDropdown.vue | 64 ------------------- components/inputs/checkbox-input.vue | 13 ---- components/settings/page.vue | 18 ------ components/settings/renderer.vue | 27 -------- components/settings/types/Boolean.vue | 41 ------------ components/settings/types/Code.vue | 26 -------- components/settings/types/Enum.vue | 64 ------------------- components/settings/types/Other.vue | 18 ------ components/settings/types/String.vue | 25 -------- components/sidebars/left-sidebar.vue | 4 -- components/sidebars/settings-sidebar.vue | 36 ----------- components/timelines/timeline.vue | 4 +- components/ui/dialog/DialogContent.vue | 2 +- components/ui/dialog/DialogScrollContent.vue | 2 +- .../DropdownMenuCheckboxItem.vue | 2 +- components/ui/input/Input.vue | 2 +- components/ui/select/SelectTrigger.vue | 2 +- components/ui/sheet/SheetContent.vue | 2 +- pages/oauth/authorize.vue | 12 ++-- pages/oauth/reset.vue | 4 +- settings.ts | 1 - 24 files changed, 25 insertions(+), 391 deletions(-) delete mode 100644 components/buttons/button-dropdown.vue delete mode 100644 components/buttons/button-mobile-navbar.vue delete mode 100644 components/dropdowns/AdaptiveDropdown.vue delete mode 100644 components/inputs/checkbox-input.vue delete mode 100644 components/settings/page.vue delete mode 100644 components/settings/renderer.vue delete mode 100644 components/settings/types/Boolean.vue delete mode 100644 components/settings/types/Code.vue delete mode 100644 components/settings/types/Enum.vue delete mode 100644 components/settings/types/Other.vue delete mode 100644 components/settings/types/String.vue delete mode 100644 components/sidebars/settings-sidebar.vue diff --git a/app.vue b/app.vue index 8bf1c28..c80789a 100644 --- a/app.vue +++ b/app.vue @@ -20,7 +20,7 @@ import { convert } from "html-to-text"; import "iconify-icon"; import ConfirmationModal from "./components/modals/confirm.vue"; import { Toaster } from "./components/ui/sonner"; -import { SettingIds } from "./settings"; +import { type EnumSetting, SettingIds } from "./settings"; // Sin //import "~/styles/mcdonalds.css"; @@ -31,6 +31,14 @@ const description = useExtendedDescription(client); const customCss = useSetting(SettingIds.CustomCSS); const route = useRoute(); +// Theme switcher +const theme = useSetting(SettingIds.Theme) as Ref; +const colorMode = useColorMode(); + +watch(theme.value, () => { + colorMode.preference = theme.value.value; +}); + useSeoMeta({ titleTemplate: (titleChunk) => { return titleChunk ? `${titleChunk} ยท Versia` : "Versia"; diff --git a/components/buttons/button-dropdown.vue b/components/buttons/button-dropdown.vue deleted file mode 100644 index 2463143..0000000 --- a/components/buttons/button-dropdown.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/buttons/button-mobile-navbar.vue b/components/buttons/button-mobile-navbar.vue deleted file mode 100644 index 93effdd..0000000 --- a/components/buttons/button-mobile-navbar.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - \ No newline at end of file diff --git a/components/dropdowns/AdaptiveDropdown.vue b/components/dropdowns/AdaptiveDropdown.vue deleted file mode 100644 index 7428596..0000000 --- a/components/dropdowns/AdaptiveDropdown.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - \ No newline at end of file diff --git a/components/inputs/checkbox-input.vue b/components/inputs/checkbox-input.vue deleted file mode 100644 index 1a6f2e2..0000000 --- a/components/inputs/checkbox-input.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - \ No newline at end of file diff --git a/components/settings/page.vue b/components/settings/page.vue deleted file mode 100644 index e098869..0000000 --- a/components/settings/page.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - \ No newline at end of file diff --git a/components/settings/renderer.vue b/components/settings/renderer.vue deleted file mode 100644 index 98373a1..0000000 --- a/components/settings/renderer.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - \ No newline at end of file diff --git a/components/settings/types/Boolean.vue b/components/settings/types/Boolean.vue deleted file mode 100644 index 707c7a4..0000000 --- a/components/settings/types/Boolean.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - \ No newline at end of file diff --git a/components/settings/types/Code.vue b/components/settings/types/Code.vue deleted file mode 100644 index f3868f3..0000000 --- a/components/settings/types/Code.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - \ No newline at end of file diff --git a/components/settings/types/Enum.vue b/components/settings/types/Enum.vue deleted file mode 100644 index 77937ec..0000000 --- a/components/settings/types/Enum.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - \ No newline at end of file diff --git a/components/settings/types/Other.vue b/components/settings/types/Other.vue deleted file mode 100644 index db1d560..0000000 --- a/components/settings/types/Other.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - \ No newline at end of file diff --git a/components/settings/types/String.vue b/components/settings/types/String.vue deleted file mode 100644 index 8903653..0000000 --- a/components/settings/types/String.vue +++ /dev/null @@ -1,25 +0,0 @@ - - - \ No newline at end of file diff --git a/components/sidebars/left-sidebar.vue b/components/sidebars/left-sidebar.vue index 5b6bb98..78205d1 100644 --- a/components/sidebars/left-sidebar.vue +++ b/components/sidebars/left-sidebar.vue @@ -66,9 +66,6 @@ - - - @@ -125,7 +122,6 @@ import { import Avatar from "../profiles/avatar.vue"; import { Button } from "../ui/button"; import AccountSwitcher from "./account-switcher.vue"; -import ThemeSwitcher from "./theme-switcher.vue"; const data = { navMain: [ diff --git a/components/sidebars/settings-sidebar.vue b/components/sidebars/settings-sidebar.vue deleted file mode 100644 index 477690c..0000000 --- a/components/sidebars/settings-sidebar.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - \ No newline at end of file diff --git a/components/timelines/timeline.vue b/components/timelines/timeline.vue index 51dbe14..985c280 100644 --- a/components/timelines/timeline.vue +++ b/components/timelines/timeline.vue @@ -36,7 +36,7 @@
-
@@ -55,8 +55,8 @@ import { CardHeader, CardTitle, } from "~/components/ui/card"; -import Button from "~/packages/ui/components/buttons/button.vue"; import { SettingIds } from "~/settings"; +import { Button } from "../ui/button"; import TimelineItem from "./timeline-item.vue"; const props = defineProps<{ diff --git a/components/ui/dialog/DialogContent.vue b/components/ui/dialog/DialogContent.vue index 71a068e..1286073 100644 --- a/components/ui/dialog/DialogContent.vue +++ b/components/ui/dialog/DialogContent.vue @@ -48,7 +48,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits); v-if="!props.hideClose" class="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground" > - + Close diff --git a/components/ui/dialog/DialogScrollContent.vue b/components/ui/dialog/DialogScrollContent.vue index fe91d48..24699f8 100644 --- a/components/ui/dialog/DialogScrollContent.vue +++ b/components/ui/dialog/DialogScrollContent.vue @@ -52,7 +52,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits); - + Close diff --git a/components/ui/dropdown-menu/DropdownMenuCheckboxItem.vue b/components/ui/dropdown-menu/DropdownMenuCheckboxItem.vue index a004d7e..58a7df0 100644 --- a/components/ui/dropdown-menu/DropdownMenuCheckboxItem.vue +++ b/components/ui/dropdown-menu/DropdownMenuCheckboxItem.vue @@ -34,7 +34,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits); > - + diff --git a/components/ui/input/Input.vue b/components/ui/input/Input.vue index 53a87ce..f60a214 100644 --- a/components/ui/input/Input.vue +++ b/components/ui/input/Input.vue @@ -19,5 +19,5 @@ const modelValue = useVModel(props, "modelValue", emits, { diff --git a/components/ui/select/SelectTrigger.vue b/components/ui/select/SelectTrigger.vue index 4ece093..bb1f615 100644 --- a/components/ui/select/SelectTrigger.vue +++ b/components/ui/select/SelectTrigger.vue @@ -32,7 +32,7 @@ const forwardedProps = useForwardProps(delegatedProps); > - + diff --git a/components/ui/sheet/SheetContent.vue b/components/ui/sheet/SheetContent.vue index 2595164..32791bb 100644 --- a/components/ui/sheet/SheetContent.vue +++ b/components/ui/sheet/SheetContent.vue @@ -49,7 +49,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits); - + diff --git a/pages/oauth/authorize.vue b/pages/oauth/authorize.vue index 7f6fb01..8dafec1 100644 --- a/pages/oauth/authorize.vue +++ b/pages/oauth/authorize.vue @@ -47,12 +47,12 @@ const { error, error_description } = useUrlSearchParams();
- - {{ error }} - - {{ error_description }} - - + + {{ error }} + + {{ error_description }} + +

Log in to your account. diff --git a/pages/oauth/reset.vue b/pages/oauth/reset.vue index 8940d06..06f161b 100644 --- a/pages/oauth/reset.vue +++ b/pages/oauth/reset.vue @@ -19,14 +19,14 @@
- + Info Your password has been reset by an administrator. Please change it here. - + {{ params.error }} {{ params.error_description }} diff --git a/settings.ts b/settings.ts index 9f08576..1bdab71 100644 --- a/settings.ts +++ b/settings.ts @@ -138,7 +138,6 @@ export const settings: Record = { }, ], page: SettingPages.Appearance, - notImplemented: true, } as EnumSetting, [SettingIds.CustomEmojis]: { title: "Render Custom Emojis",