Skip to content

Commit c3b93c4

Browse files
connorabbasconnorabbas
authored
Merge pull request #41 from connorabbas/develop
Changes from Inertia project
2 parents 7903035 + 73d53d5 commit c3b93c4

File tree

7 files changed

+17
-31
lines changed

7 files changed

+17
-31
lines changed

‎src/app.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,11 @@ import Container from '@/components/Container.vue';
1515
import PageTitleSection from '@/components/PageTitleSection.vue';
1616

1717
import { useColorMode } from '@vueuse/core';
18-
import { useThemePreset } from '@/composables/useThemePreset';
18+
import themePreset from '@/theme/noir-preset';
1919

2020
// Site light/dark mode
2121
const colorMode = useColorMode({ emitAuto: true });
2222

23-
// Site theme preset
24-
const { getCurrentPreset } = useThemePreset();
25-
const themePreset = getCurrentPreset();
26-
2723
const app = createApp(App);
2824
const pinia = createPinia();
2925

‎src/components/DeleteUserModal.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ const deleteAccount = () => {
6666

6767
<div class="flex flex-col gap-2">
6868
<Password
69-
id="password"
7069
ref="password-input"
7170
v-model="formData.password"
7271
:invalid="Boolean(validationErrors?.password)"
7372
placeholder="Password"
7473
autocomplete="current-password"
74+
inputId="password"
7575
:feedback="false"
7676
toggleMask
7777
autofocus

‎src/views/auth/Login.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ onMounted(() => {
8787
<div class="flex flex-col gap-2">
8888
<label for="password">Password</label>
8989
<Password
90-
id="password"
9190
v-model="formData.password"
9291
:invalid="Boolean(validationErrors?.password)"
9392
:feedback="false"
9493
autocomplete="current-password"
94+
inputId="password"
9595
toggleMask
9696
required
9797
fluid
@@ -103,10 +103,10 @@ onMounted(() => {
103103
<div class="flex items-center justify-between">
104104
<div class="flex items-center">
105105
<Checkbox
106-
id="remember"
107106
v-model="formData.remember"
108-
:binary="true"
109107
class="mr-2"
108+
inputId="remember"
109+
:binary="true"
110110
/>
111111
<label for="remember">Remember me</label>
112112
</div>

‎src/views/auth/Register.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ onMounted(() => {
7979
<div class="flex flex-col gap-2">
8080
<label for="password">Password</label>
8181
<Password
82-
id="password"
8382
v-model="formData.password"
8483
:invalid="Boolean(validationErrors?.password)"
8584
autocomplete="new-password"
85+
inputId="password"
8686
toggleMask
8787
required
8888
fluid
@@ -91,13 +91,13 @@ onMounted(() => {
9191
</div>
9292

9393
<div class="flex flex-col gap-2">
94-
<label for="password_confirmation">Confirm Password</label>
94+
<label for="password-confirmation">Confirm Password</label>
9595
<Password
96-
id="password_confirmation"
9796
v-model="formData.password_confirmation"
9897
:invalid="Boolean(validationErrors?.password_confirmation)"
9998
:feedback="false"
10099
autocomplete="new-password"
100+
inputId="password-confirmation"
101101
toggleMask
102102
required
103103
fluid

‎src/views/auth/ResetPassword.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ onMounted(() => {
7777
<div class="flex flex-col gap-2">
7878
<label for="password">New Password</label>
7979
<Password
80-
id="password"
8180
v-model="formData.password"
8281
:invalid="Boolean(validationErrors?.password)"
8382
autocomplete="new-password"
83+
inputId="password"
8484
toggleMask
8585
required
8686
fluid
@@ -89,13 +89,13 @@ onMounted(() => {
8989
</div>
9090
9191
<div class="flex flex-col gap-2">
92-
<label for="password_confirmation">Confirm New Password</label>
92+
<label for="password-confirmation">Confirm New Password</label>
9393
<Password
94-
id="password_confirmation"
9594
v-model="formData.password_confirmation"
9695
:invalid="Boolean(validationErrors?.password_confirmation)"
9796
:feedback="false"
9897
autocomplete="new-password"
98+
inputId="password-confirmation"
9999
toggleMask
100100
required
101101
fluid

‎src/views/settings/Appearance.vue‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import AppLayout from '@/layouts/AppLayout.vue';
33
import SettingsLayout from '@/layouts/UserSettingsLayout.vue';
44
import SelectColorModeButton from '@/components/SelectColorModeButton.vue';
5-
import ThemePresetSelector from '@/components/ThemePresetSelector.vue';
65
</script>
76

87
<template>
@@ -19,16 +18,7 @@ import ThemePresetSelector from '@/components/ThemePresetSelector.vue';
1918
Update your account's appearance settings
2019
</template>
2120
<template #content>
22-
<div class="space-y-6">
23-
<div class="flex flex-col gap-2">
24-
<label for="color-mode-selector">Color Mode</label>
25-
<SelectColorModeButton id="color-mode-selector" />
26-
</div>
27-
<div class="flex flex-col gap-2">
28-
<label for="theme-preset-selector">Theme</label>
29-
<ThemePresetSelector id="theme-preset-selector" />
30-
</div>
31-
</div>
21+
<SelectColorModeButton id="color-mode-selector" />
3222
</template>
3323
</Card>
3424
</SettingsLayout>

‎src/views/settings/Password.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ const submit = () => {
7979
@submit.prevent="submit"
8080
>
8181
<div class="flex flex-col gap-2">
82-
<label for="current_password">Current Password</label>
82+
<label for="current-password">Current Password</label>
8383
<Password
84-
id="current_password"
8584
ref="current-password-input"
8685
v-model="formData.current_password"
8786
:invalid="Boolean(validationErrors?.current_password)"
8887
:feedback="false"
8988
autocomplete="current-password"
89+
inputId="current-password"
9090
toggleMask
9191
required
9292
fluid
@@ -97,11 +97,11 @@ const submit = () => {
9797
<div class="flex flex-col gap-2">
9898
<label for="password">New Password</label>
9999
<Password
100-
id="password"
101100
ref="new-password-input"
102101
v-model="formData.password"
103102
:invalid="Boolean(validationErrors?.password)"
104103
autocomplete="new-password"
104+
inputId="password"
105105
toggleMask
106106
required
107107
fluid
@@ -110,13 +110,13 @@ const submit = () => {
110110
</div>
111111
112112
<div class="flex flex-col gap-2">
113-
<label for="password_confirmation">Confirm Password</label>
113+
<label for="password-confirmation">Confirm Password</label>
114114
<Password
115-
id="password_confirmation"
116115
v-model="formData.password_confirmation"
117116
:invalid="Boolean(validationErrors?.password_confirmation)"
118117
:feedback="false"
119118
autocomplete="confirm-password"
119+
inputId="password-confirmation"
120120
toggleMask
121121
required
122122
fluid

0 commit comments

Comments
 (0)