Skip to content

Commit 633536e

Browse files
David Paquettedpaquette
andauthored
Resolve welcome page a11y violations (#119)
Co-authored-by: David Paquette <[email protected]>
1 parent b1dcd78 commit 633536e

4 files changed

Lines changed: 37 additions & 30 deletions

File tree

2wr-app/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"build": "vue-cli-service build",
1111
"lint": "vue-cli-service lint",
1212
"api": "func start --prefix ..\\api\\TwoWeeksReady\\",
13-
"azurite": "azurite --silent --location c:\\temp\\azurite"
13+
"azurite": "azurite --silent --location c:\\temp\\azurite",
14+
"e2etest": "playwright test"
1415
},
1516
"dependencies": {
1617
"@auth0/auth0-spa-js": "^1.13.6",

2wr-app/src/App.vue

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<v-app :style="{background: $vuetify.theme.themes[theme].background}">
3-
<div v-if="isBusy" class="loading-line"></div>
3+
<div v-if="isBusy" class="loading-line" role="progressbar"></div>
44
<v-main>
55
<router-view></router-view>
66
<v-dialog persistent :value="error">
@@ -17,33 +17,32 @@
1717
</v-dialog>
1818
</v-main>
1919
<!-- Check that the SDK client is not currently loading before accessing is methods -->
20-
<div>
2120
<!-- show login when not authenticated -->
2221

23-
<!-- show logout when authenticated -->
24-
<v-bottom-navigation app fixed background-color="secondary">
25-
<v-btn v-if="!$auth.isAuthenticated" height="100%" @click="login" color="secondary">
26-
<span>login</span>
27-
<v-icon>mdi-login-variant</v-icon>
28-
</v-btn>
29-
<v-btn v-if="$auth.isAuthenticated" to="/prepare" height="100%" color="secondary">
30-
<span>Prepare</span>
31-
<v-icon>mdi-clipboard-list-outline</v-icon>
32-
</v-btn>
33-
<v-btn v-if="$auth.isAuthenticated" to="/recent" height="100%" color="secondary">
34-
<span>Recent Events</span>
35-
<v-icon>mdi-calendar-star</v-icon>
36-
</v-btn>
37-
<v-btn v-if="$auth.isAuthenticated" to="/settings" height="100%" color="secondary">
38-
<span>Settings</span>
39-
<v-icon>mdi-cog</v-icon>
40-
</v-btn>
41-
<v-btn v-if="$auth.isAuthenticated" @click="logout" height="100%" color="secondary">
42-
<span>Logout</span>
43-
<v-icon>mdi-logout-variant</v-icon>
44-
</v-btn>
45-
</v-bottom-navigation>
46-
</div>
22+
<!-- show logout when authenticated -->
23+
<v-bottom-navigation background-color="secondary" dark role="navigation">
24+
<v-btn v-if="!$auth.isAuthenticated" height="100%" @click="login" color="secondary">
25+
<span>Login</span>
26+
<v-icon>mdi-login-variant</v-icon>
27+
</v-btn>
28+
<v-btn v-if="$auth.isAuthenticated" to="/prepare" height="100%" color="secondary">
29+
<span>Prepare</span>
30+
<v-icon>mdi-clipboard-list-outline</v-icon>
31+
</v-btn>
32+
<v-btn v-if="$auth.isAuthenticated" to="/recent" height="100%" color="secondary">
33+
<span>Recent Events</span>
34+
<v-icon>mdi-calendar-star</v-icon>
35+
</v-btn>
36+
<v-btn v-if="$auth.isAuthenticated" to="/settings" height="100%" color="secondary">
37+
<span>Settings</span>
38+
<v-icon>mdi-cog</v-icon>
39+
</v-btn>
40+
<v-btn v-if="$auth.isAuthenticated" @click="logout" height="100%" color="secondary">
41+
<span>Logout</span>
42+
<v-icon>mdi-logout-variant</v-icon>
43+
</v-btn>
44+
</v-bottom-navigation>
45+
4746
</v-app>
4847
</template>
4948

@@ -79,6 +78,12 @@ export default {
7978
</script>
8079

8180
<style scoped>
81+
82+
.theme--dark.v-bottom-navigation .v-btn:not(.v-btn--active)
83+
{
84+
color: rgba(255, 255, 255, .95) !important;
85+
}
86+
8287
.loading-line {
8388
height: 3px;
8489
position: absolute;

2wr-app/src/components/welcome/welcome-landing.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<v-container>
33
<v-row class="text-center">
44
<v-col cols="12">
5-
<img src="/img/icons/safari-pinned-tab.svg" width="350" />
5+
<img src="/img/icons/safari-pinned-tab.svg" width="350" alt="2 Weeks Ready Backpack Logo"/>
66
</v-col>
77

88
<v-col v-if="stage === 1" cols="12" md="6" offset-md="3" class="text-left pa-6">
9-
<h2 class="text-center text-uppercase">Welcome to 2 weeks ready</h2>
9+
<h1 class="text-center text-uppercase text-h2">Welcome to 2 weeks ready</h1>
1010
<p>
1111
<strong>2 Weeks Ready</strong> is a mobile application that makes
1212
emergency preparedness a <strong>simple</strong>,
@@ -49,6 +49,7 @@
4949
fab
5050
class="mb-12"
5151
@click="next()"
52+
aria-label="Next"
5253
>
5354
<v-icon>mdi-chevron-right</v-icon>
5455
</v-btn>

2wr-app/src/plugins/vuetify.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import VueRouter from 'vue-router'
66

77
const themeColors = {
88
lightOrange: "#f99b2c",
9-
darkOrange: "#d75727",
9+
darkOrange: "#c14d23",
1010
background: "#f8f1c7"
1111
}
1212

0 commit comments

Comments
 (0)