Merge branch 'main' into ankit

TBD54566975 · Oct 31, 2024 · 5ad878a · 5ad878a
2 parents 09ba2e6 + 9a7c524
commit 5ad878a
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 88 deletions.
diff --git a/javascript/dwa-starter-vue/pnpm-lock.yaml b/javascript/dwa-starter-vue/pnpm-lock.yaml
diff --git a/javascript/dwa-starter-vue/src/App.vue b/javascript/dwa-starter-vue/src/App.vue
@@ -9,7 +9,7 @@ import Sidebar from '@/components/Sidebar.vue'
       <Sidebar />
     </header>
 
-    <main class="p-4 lg:h-screen overflow-y-auto flex flex-col w-full">
+    <main class="p-4 lg:h-screen overflow-y-auto flex flex-col w-full" aria-labelledby="region-id">
       <RouterView />
     </main>
   </div>

diff --git a/javascript/dwa-starter-vue/src/views/SettingsView.vue b/javascript/dwa-starter-vue/src/views/SettingsView.vue
@@ -89,10 +89,10 @@ const onSubmit = handleSubmit(async (values) => {
 
 <template>
   <div class="flex flex-col gap-4">
-    <h1>Settings</h1>
+    <h1 id="region-id">Settings</h1>
 
-    <h2>Profile Settings</h2>
-    <form class="lg:w-1/3 w-full space-y-6" @submit.prevent="onSubmit">
+    <h2 id="profile-form-id">Profile Settings</h2>
+    <form class="lg:w-1/3 w-full space-y-6" aria-labelledby="profile-form-id" @submit.prevent="onSubmit">
       <img
         v-if="profileImageSrc"
         :src="profileImageSrc"
@@ -104,8 +104,8 @@ const onSubmit = handleSubmit(async (values) => {
       <FormField name="profileImage" class="w-full">
         <FormItem>
           <FormLabel>Profile Image</FormLabel>
-          <FormControl>
-            <div class="flex items-center gap-2">
+          <div class="flex items-center gap-2">
+            <FormControl>
               <Input
                 type="file"
                 accept="image/*"
@@ -114,8 +114,8 @@ const onSubmit = handleSubmit(async (values) => {
                 :key="fileInputKey"
               />
               <Button type="button" @click="clearImage" v-if="profileImageSrc">Clear Image</Button>
-            </div>
-          </FormControl>
+            </FormControl>
+          </div>
           <FormDescription>Upload your profile image.</FormDescription>
           <FormMessage />
         </FormItem>
@@ -133,7 +133,8 @@ const onSubmit = handleSubmit(async (values) => {
       </FormField>
 
       <Button type="submit" :disabled="isSubmitting">
-        <ReloadIcon v-if="isSubmitting" class="w-4 h-4 mr-2 animate-spin" />
+        <ReloadIcon v-if="isSubmitting" class="w-4 h-4 mr-2 animate-spin"  />
+        <span v-if="isSubmitting" class="sr-only">Submitting your changes</span>
         <span v-else>Save</span>
       </Button>
     </form>

diff --git a/javascript/shared-todo-starter/package-lock.json b/javascript/shared-todo-starter/package-lock.json
diff --git a/javascript/shared-todo-starter/package.json b/javascript/shared-todo-starter/package.json
@@ -19,7 +19,7 @@
     "@tailwindcss/typography": "0.5.15",
     "@types/node": "20.16.12",
     "nuxt": "3.13.2",
-    "sass": "1.80.4",
+    "sass": "1.80.5",
     "sass-loader": "16.0.2",
     "start-server-and-test": "^2.0.4"
   },

diff --git a/javascript/shared-todo/package-lock.json b/javascript/shared-todo/package-lock.json
diff --git a/javascript/shared-todo/package.json b/javascript/shared-todo/package.json
@@ -18,7 +18,7 @@
     "@tailwindcss/typography": "0.5.15",
     "@types/node": "20.16.12",
     "nuxt": "3.13.2",
-    "sass": "1.80.4",
+    "sass": "1.80.5",
     "sass-loader": "16.0.2",
     "start-server-and-test": "^2.0.4"
   },