From dd70688e8af10938b0ba0ebb0086190a1667648b Mon Sep 17 00:00:00 2001
From: banaanihillo <banaanihillo@protonmail.ch>
Date: Sun, 5 May 2024 12:20:13 +0300
Subject: [PATCH] Keyboard handlers and aria labels added

+ locales cleanup
---
 src/components/Btn.vue       |  9 +++++++--
 src/components/NavBar.vue    |  7 ++++++-
 src/components/Playlists.vue | 10 ++++++++--
 src/components/Search.vue    | 17 ++++++++++++-----
 src/components/SongItem.vue  | 19 +++++++++++++++----
 src/components/StatusBar.vue | 34 +++++++++++++++++++++++-----------
 src/locales/en.json          | 33 +++++++++++++++++++++++++++------
 7 files changed, 98 insertions(+), 31 deletions(-)

diff --git a/src/components/Btn.vue b/src/components/Btn.vue
index 9a2f14b..0248aa1 100644
--- a/src/components/Btn.vue
+++ b/src/components/Btn.vue
@@ -1,12 +1,17 @@
 <script setup>
 defineProps(['ico']);
 defineEmits(['click']);
+
+import { useI18n } from '@/stores/misc.js';
+const {t} = useI18n()
 </script>
 
 <template>
   <button
-    :class="'bi clickable bi-' + (ico ? ico : 'play')"
-    @click="$emit('click')">
+    :class="'bi clickable bi-' + (ico ?? 'play')"
+    @click="$emit('click')"
+    :aria-label="ico ? t(`action.${ico}`) : 'play'"
+    :title="ico ? t(`action.${ico}`) : 'play'">
     <slot name="menu"></slot>
   </button>
 </template>
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index adb493b..1b1d2d7 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -28,7 +28,12 @@ function set(page) {
 
 <template>
   <nav>
-    <h1 class="bi" @click="home">
+    <h1
+      class="bi"
+      @click="home"
+      @keydown.enter="home"
+      tabindex="0"
+      aria-label="Home">
       <IcoHyp />
     </h1>
 
diff --git a/src/components/Playlists.vue b/src/components/Playlists.vue
index 5607492..922667a 100644
--- a/src/components/Playlists.vue
+++ b/src/components/Playlists.vue
@@ -44,6 +44,7 @@ onMounted(() => {
         <button
           class="bi bi-shuffle pl-btn"
           title="shuffle queue"
+          :aria-label="t('queue.shuffle')"
           @click="
             () => {
               data.state.urls = useShuffle(data.state.urls);
@@ -52,7 +53,8 @@ onMounted(() => {
           "></button>
         <button
           class="bi bi-bookmark-plus pl-btn"
-          title="save queue"
+          :title="t('playlist.save')"
+          :aria-label="t('playlist.save')"
           @click="
             () => {
               let urls = data.state.urls.map(i => ({
@@ -67,13 +69,17 @@ onMounted(() => {
         <button
           class="bi bi-dash-lg pl-btn"
           title="clear queue"
+          :aria-label="t('queue.clear')"
           @click="data.state.urls = []"></button>
       </div>
       <div
         v-for="plurl in data.state.urls"
         class="pl-item"
         :key="plurl.url"
-        @click="handleClick(plurl, $event)">
+        @click="handleClick(plurl, $event)"
+        tabindex="0"
+        @keydown.enter="handleClick(plurl, $event)"
+        :aria-label="`Play track: ${plurl.title}`">
         <span
           v-if="data.state.url == plurl.url"
           class="bars-wrap"
diff --git a/src/components/Search.vue b/src/components/Search.vue
index 7f7792a..057a4ec 100644
--- a/src/components/Search.vue
+++ b/src/components/Search.vue
@@ -274,9 +274,13 @@ onDeactivated(() => {
           <div v-if="albumMenu" class="alb popup">
             <button
               class="bi bi-bookmark-plus clickable"
-              @click="saveAlbum"></button>
+              @click="saveAlbum"
+              :aria-label="t('playlist.save')"></button>
 
-            <button class="bi bi-share clickable" @click="shareAlbum"></button>
+            <button
+              class="bi bi-share clickable"
+              @click="shareAlbum"
+              :aria-label="t('action.share')"></button>
 
             <button
               class="bi bi-plus-lg clickable"
@@ -288,16 +292,19 @@ onDeactivated(() => {
                     thumbnails: [{ url: i.thumbnail }],
                   })),
                 )
-              "></button>
+              "
+              :aria-label="t('queue.add')"></button>
 
             <button
               class="bi bi-shuffle clickable"
-              @click="shuffleAdd"></button>
+              @click="shuffleAdd"
+              :aria-label="t('action.shuffle')"></button>
 
             <button
               v-if="plId"
               class="bi bi-trash3 clickable"
-              @click="removePlaylist"></button>
+              @click="removePlaylist"
+              :aria-label="t('playlist.remove')"></button>
           </div>
         </Transition>
       </template>
diff --git a/src/components/SongItem.vue b/src/components/SongItem.vue
index fbdeb69..3286dec 100644
--- a/src/components/SongItem.vue
+++ b/src/components/SongItem.vue
@@ -129,7 +129,7 @@ const openSong = el => {
         <i class="ign">{{ author ? author.replaceAll(' - Topic', '') : '' }}</i>
       </a>
       <span v-if="play === data.state?.url">
-        <span class="bi-play"></span>
+        <span class="bi-play" aria-hidden="true"></span>
         <span>{{ t('title.now_playing') }}</span>
       </span>
     </span>
@@ -138,24 +138,35 @@ const openSong = el => {
       class="bi bi-three-dots-vertical popup-wrap ign"
       @mouseenter="show = true"
       @mouseleave="show = false"
-      @keyup.enter="show = !show">
+      @keyup.enter="show = !show"
+      :aria-label="t('action.more_controls')">
       <Transition name="fade">
         <div v-if="show" class="popup ign">
           <button
             v-if="playlistId || offlineUri"
             class="bi bi-dash-lg clickable ign"
+            :aria-label="t('playlist.remove_from')"
             @click="Remove"></button>
           <button
             class="bi bi-chevron-bar-right clickable ign"
+            :aria-label="t('queue.add_to_top')"
             @click="appendSong"></button>
           <button
             class="bi bi-collection clickable ign"
+            :aria-label="t('playlist.add')"
             @click="showPl = true"></button>
           <button
             class="bi bi-broadcast clickable ign"
+            :aria-label="t('action.play_now')"
             @click="$emit('nxt-song')"></button>
-          <button class="bi bi-plus-lg clickable ign" @click="addSong"></button>
-          <button class="bi bi-share clickable ign" @click="Share"></button>
+          <button
+            class="bi bi-plus-lg clickable ign"
+            :aria-label="t('queue.add_to_bottom')"
+            @click="addSong"></button>
+          <button
+            class="bi bi-share clickable ign"
+            :aria-label="t('action.share')"
+            @click="Share"></button>
         </div>
       </Transition>
     </button>
diff --git a/src/components/StatusBar.vue b/src/components/StatusBar.vue
index cc6880d..755a87f 100644
--- a/src/components/StatusBar.vue
+++ b/src/components/StatusBar.vue
@@ -77,10 +77,16 @@ async function Like() {
 <template>
   <div id="statusbar" class="flex">
     <div class="flex statusbar-progress-container">
-      <span>{{ getFormattedTime(player.state.realTime) }}</span>
-      <div id="statusbar-progress" class="range-wrap">
+      <span
+        :aria-label="t('info.time_elapsed')">
+        {{ getFormattedTime(player.state.realTime) }}
+      </span>
+      <div
+        id="statusbar-progress"
+        class="range-wrap"
+        :aria-label="t('action.change_time')">
         <input
-          aria-label="Change Time"
+          :aria-label="t('action.change_time')"
           :value="player.state.time"
           type="range"
           name="statusbar-progress"
@@ -90,7 +96,10 @@ async function Like() {
               ($event.target.value / 100) * player.state.duration
           " />
       </div>
-      <span>{{ getFormattedTime(player.state.duration) }}</span>
+      <span
+        :aria-label="t('info.track_duration')">
+        {{ getFormattedTime(player.state.duration) }}
+      </span>
     </div>
 
     <div class="flex statusbar-controls-container">
@@ -150,7 +159,7 @@ async function Like() {
                 : 'hidden',
           }"
           id="btn-nexttrack"
-          aria-label="Play next track"
+          :aria-label="t('action.play_next_track')"
           class="bi bi-chevron-bar-right clickable"
           @click="data.nextTrack"></button>
       </div>
@@ -179,7 +188,7 @@ async function Like() {
 
         <button
           class="bi bi-three-dots clickable"
-          aria-label="More Controls"
+          :aria-label="t('action.more_controls')"
           @click="
             showme.menu = !showme.menu;
             showme.vol = false;
@@ -189,14 +198,16 @@ async function Like() {
             <button
               id="info-btn"
               class="bi bi-info-circle clickable"
-              aria-label="Show Information About Song"
+              :title="t('action.show_information_about_track')"
+              :aria-label="t('action.show_information_about_track')"
               :data-active="player.state.info"
               @click="player.toggle('info')"></button>
 
             <button
               v-if="store.auth"
               id="like-btn"
-              title="Add song to favorites"
+              :title="t('action.add_track_to_favorites')"
+              :aria-label="t('action.add_track_to_favorites')"
               class="bi blink clickable"
               :class="data.state.url == liked ? 'bi-heart-fill' : 'bi-heart'"
               :data-active="data.state.url == liked"
@@ -205,14 +216,15 @@ async function Like() {
 
             <button
               id="dl-btn"
-              title="Save for Offline Playback"
+              :title="t('action.save_for_offline_playback')"
+              :aria-label="t('action.save_for_offline_playback')"
               class="bi bi-download clickable"
               @click="Offline"></button>
 
             <button
               id="addToPlaylist"
-              :title="t('statusBar.add_current_to_playlist')"
-              :aria-label="t('statusBar.add_current_to_playlist')"
+              :title="t('playlist.add')"
+              :aria-label="t('playlist.add')"
               class="bi bi-collection clickable"
               @click="
                 player.toggle('add');
diff --git a/src/locales/en.json b/src/locales/en.json
index ec4f286..f297c3c 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -30,16 +30,36 @@
     "receive": "Receive",
     "import": "Import",
     "export": "Export",
-    "register_on": "Don't have an account? Register on"
+    "register_on": "Don't have an account? Register on",
+    "play_now": "Play now",
+    "share": "Share",
+    "play_next_track": "Play next track",
+    "change_time": "Change time",
+    "add_track_to_favorites": "Add track to favorites",
+    "save_for_offline_playback": "Save for offline playback",
+    "show_information_about_track": "Show information about track",
+    "more_controls": "More controls",
+    "three-dots": "More controls",
+    "shuffle": "Shuffle"
   },
   "playlist": {
     "local": "Local Playlists",
     "remote": "Remote Playlists",
     "name": "Playlist name",
-    "add": "Add Songs to Playlist",
+    "add": "Add to Playlist",
     "create": "Create a new Playlist",
     "sync": "Sync playlists",
-    "select": "Select Playlist to Add"
+    "select": "Select Playlist to Add",
+    "remove_from": "Remove from playlist",
+    "remove": "Remove playlist",
+    "save": "Save as playlist"
+  },
+  "queue": {
+    "clear": "Clear queue",
+    "shuffle": "Shuffle queue",
+    "add": "Add to queue",
+    "add_to_top": "Add to top of queue",
+    "add_to_bottom": "Add to bottom of queue"
   },
   "artist": {
     "subscribers": "Subscribers",
@@ -80,7 +100,9 @@
     "search": "Start Searching",
     "no_info": "No Information Available",
     "saved": "Saved!",
-    "copied_to_clipboard": "Copied to Clipboard"
+    "copied_to_clipboard": "Copied to Clipboard",
+    "time_elapsed": "Time elapsed",
+    "track_duration": "Track duration"
   },
   "instances": {
     "hyp": "Hyperpipe Instance",
@@ -103,8 +125,7 @@
   },
   "statusBar": {
     "currentPlaylist": "Current Playlist",
-    "loop": "Loop",
-    "add_current_to_playlist": "Add Current Song to a Playlist"
+    "loop": "Loop"
   },
   "general": {
     "username": "username",