Skip to content

Pull main, dark mode toggle #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 31, 2024
Merged

Pull main, dark mode toggle #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9b8d67
streamlined dark mode
connorabbas Dec 31, 2024
856d9bd
Merge pull request #94 from connorabbas/develop
connorabbas Dec 31, 2024
c888637
Merge branch 'master' of github.com:connorabbas/laravel-inertia-prime…
connorabbas Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 43 additions & 23 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"vue": "^3.5.0"
},
"dependencies": {
"@vueuse/core": "^12.2.0",
"lodash": "^4.17.21"
}
}
14 changes: 14 additions & 0 deletions resources/js/Components/ToggleDarkModeButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<script setup>
import { useDark, useToggle } from '@vueuse/core';

const isDark = useDark();
const toggleDark = useToggle(isDark);
</script>

<template>
<Button
title="Toggle Light/Dark Mode"
:icon="isDark ? 'pi pi-moon' : 'pi pi-sun'"
@click="toggleDark()"
/>
</template>
18 changes: 0 additions & 18 deletions resources/js/Components/ToggleThemeButton.vue
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions resources/js/Composables/useTheme.js
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions resources/js/Layouts/Admin/Partials/TopNav.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { useTemplateRef } from 'vue';
import { useForm, usePage } from '@inertiajs/vue3';
import ApplicationLogo from '@/Components/ApplicationLogo.vue';
import ToggleThemeButton from '@/Components/ToggleThemeButton.vue';
import ToggleDarkModeButton from '@/Components/ToggleDarkModeButton.vue';
import LinksMenu from '@/Components/PrimeVue/LinksMenu.vue';
import LinksMenuBar from '@/Components/PrimeVue/LinksMenuBar.vue';

Expand Down Expand Up @@ -70,7 +70,7 @@ const toggleUserMenu = (event) => {
<template #end>
<div class="flex items-center space-x-3">
<div>
<ToggleThemeButton
<ToggleDarkModeButton
text
severity="secondary"
rounded
Expand Down
6 changes: 3 additions & 3 deletions resources/js/Layouts/AuthenticatedLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Container from '@/Components/Container.vue';
import LinksMenu from '@/Components/PrimeVue/LinksMenu.vue';
import LinksMenuBar from '@/Components/PrimeVue/LinksMenuBar.vue';
import LinksPanelMenu from '@/Components/PrimeVue/LinksPanelMenu.vue';
import ToggleThemeButton from '@/Components/ToggleThemeButton.vue';
import ToggleDarkModeButton from '@/Components/ToggleDarkModeButton.vue';

const currentRoute = route().current();
const logoutForm = useForm({});
Expand Down Expand Up @@ -111,7 +111,7 @@ watchEffect(() => {
class="hidden lg:flex items-center ms-6 space-x-3"
>
<div>
<ToggleThemeButton
<ToggleDarkModeButton
text
severity="secondary"
rounded
Expand Down Expand Up @@ -169,7 +169,7 @@ watchEffect(() => {
<!-- Mobile drawer menu -->
<Drawer v-model:visible="mobileMenuOpen" position="right">
<template #header>
<ToggleThemeButton text severity="secondary" rounded />
<ToggleDarkModeButton text severity="secondary" rounded />
</template>
<div>
<div>
Expand Down
4 changes: 2 additions & 2 deletions resources/js/Pages/Welcome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup>
import { computed } from 'vue';
import ToggleThemeButton from '@/Components/ToggleThemeButton.vue';
import ToggleDarkModeButton from '@/Components/ToggleDarkModeButton.vue';

const props = defineProps({
canLogin: {
Expand Down Expand Up @@ -99,7 +99,7 @@ const dashboardRoute = computed(() => {
/>
</Link>
</template>
<ToggleThemeButton outlined />
<ToggleDarkModeButton outlined />
<div class="mt-6">
<p class="m-0 text-sm text-muted-color">
Laravel v{{ laravelVersion }} (PHP v{{
Expand Down
6 changes: 0 additions & 6 deletions resources/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import PrimeVue from 'primevue/config';
import ToastService from 'primevue/toastservice';
import Tooltip from 'primevue/tooltip';

import { useTheme } from '@/Composables/useTheme.js';
import customThemePreset from '@/theme-preset.js';

import Container from './Components/Container.vue';
Expand All @@ -26,11 +25,6 @@ createInertiaApp({
import.meta.glob('./Pages/**/*.vue')
),
setup({ el, App, props, plugin }) {
// set site theme (light/dark mode)
const { initSiteTheme } = useTheme();
initSiteTheme();

// start the app
return createApp({ render: () => h(App, props) })
.use(plugin)
.use(ZiggyVue, Ziggy)
Expand Down
2 changes: 1 addition & 1 deletion resources/js/theme-preset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const customThemePreset = definePreset(Preset, {
export default {
preset: customThemePreset,
options: {
darkModeSelector: '.dark-mode',
darkModeSelector: '.dark',
cssLayer: {
name: 'primevue',
order: 'tailwind-base, primevue, tailwind-utilities',
Expand Down
Loading