From 6daf083b3fa7356094357e50088c4082a37711cb Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 12 Apr 2020 06:24:35 +0200
Subject: [PATCH] Clean up some code.

---
 .../Controllers/Chart/AccountController.php   |  2 +-
 database/factories/ModelFactory.php           |  2 +-
 .../assets/js/components/bills/Index.vue      | 19 ++++++++++---------
 .../components/passport/AuthorizedClients.vue |  7 ++++---
 .../assets/js/components/passport/Clients.vue | 11 ++++++-----
 .../passport/PersonalAccessTokens.vue         |  5 +++--
 6 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php
index 1e6b5dbb6e..d6d1b4e786 100644
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -438,7 +438,7 @@ class AccountController extends Controller
 
         // if the account is not expense or revenue, just use the account's default currency.
         if (!in_array($account->accountType->type, [AccountType::REVENUE, AccountType::EXPENSE], true)) {
-            $currencies= [$this->accountRepository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency()];
+            $currencies = [$this->accountRepository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency()];
         }
 
         /** @var TransactionCurrency $currency */
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index aea14f83cc..d52f908a3c 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -30,7 +30,7 @@ $factory->define(
             'user_id'         => 1,
             'attachable_id'   => 1,
             'attachable_type' => TransactionJournal::class,
-            'md5'             => md5($faker->words(6, true)),
+            'md5'             => substr(hash('sha256', $faker->words(6, true)), 0, 32),
             'mime'            => 'text/plain',
             'size'            => 1,
             'filename'        => 'ok',
diff --git a/resources/assets/js/components/bills/Index.vue b/resources/assets/js/components/bills/Index.vue
index 3c702e6183..1ff1c90048 100644
--- a/resources/assets/js/components/bills/Index.vue
+++ b/resources/assets/js/components/bills/Index.vue
@@ -20,17 +20,18 @@
 <template>
     <div>
         <table class="table table-hover sortable">
+            <caption>Bills table</caption>
             <thead>
             <tr>
-                <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
-                <th>{{ 'list.name' | trans }}</th>
-                <th data-defaultsign="az" class="hidden-sm hidden-md hidden-xs">{{ 'list.matchesOn' | trans }}</th>
-                <th data-defaultsign="_19" colspan="2">{{ 'list.amount' | trans }}</th>
-                <th data-defaultsign="month" class="hidden-sm hidden-xs">{{ 'list.paid_current_period' | trans }}</th>
-                <th data-defaultsign="month" class="hidden-sm hidden-xs">{{ 'list.next_expected_match' | trans }}</th>
-                <th class="hidden-sm hidden-xs hidden-md">{{ 'list.active' | trans }}</th>
-                <th class="hidden-sm hidden-xs hidden-md">{{ 'list.automatch' | trans }}</th>
-                <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ 'list.repeat_freq' | trans }}</th>
+                <th scope="col" class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
+                <th scope="col">{{ 'list.name' | trans }}</th>
+                <th scope="col"data-defaultsign="az" class="hidden-sm hidden-md hidden-xs">{{ 'list.matchesOn' | trans }}</th>
+                <th scope="col" data-defaultsign="_19" colspan="2">{{ 'list.amount' | trans }}</th>
+                <th scope="col" data-defaultsign="month" class="hidden-sm hidden-xs">{{ 'list.paid_current_period' | trans }}</th>
+                <th scope="col" data-defaultsign="month" class="hidden-sm hidden-xs">{{ 'list.next_expected_match' | trans }}</th>
+                <th scope="col" class="hidden-sm hidden-xs hidden-md">{{ 'list.active' | trans }}</th>
+                <th scope="col" class="hidden-sm hidden-xs hidden-md">{{ 'list.automatch' | trans }}</th>
+                <th scope="col" data-defaultsign="az" class="hidden-sm hidden-xs">{{ 'list.repeat_freq' | trans }}</th>
             </tr>
             </thead>
             <tbody>
diff --git a/resources/assets/js/components/passport/AuthorizedClients.vue b/resources/assets/js/components/passport/AuthorizedClients.vue
index b8e60e4e49..272b27fec0 100644
--- a/resources/assets/js/components/passport/AuthorizedClients.vue
+++ b/resources/assets/js/components/passport/AuthorizedClients.vue
@@ -41,11 +41,12 @@
                 <div class="box-body">
                     <!-- Authorized Tokens -->
                     <table class="table table-borderless m-b-none">
+                        <caption>Authorized clients</caption>
                         <thead>
                         <tr>
-                            <th>Name</th>
-                            <th>Scopes</th>
-                            <th></th>
+                            <th scope="col">Name</th>
+                            <th scope="col">Scopes</th>
+                            <th scope="col"></th>
                         </tr>
                         </thead>
 
diff --git a/resources/assets/js/components/passport/Clients.vue b/resources/assets/js/components/passport/Clients.vue
index 8603740eac..43824810f0 100644
--- a/resources/assets/js/components/passport/Clients.vue
+++ b/resources/assets/js/components/passport/Clients.vue
@@ -45,13 +45,14 @@
                 </p>
 
                 <table class="table table-borderless m-b-none" v-if="clients.length > 0">
+                    <caption>Clients</caption>
                     <thead>
                         <tr>
-                            <th>Client ID</th>
-                            <th>Name</th>
-                            <th>Secret</th>
-                            <th></th>
-                            <th></th>
+                            <th scope="col">Client ID</th>
+                            <th scope="col">Name</th>
+                            <th scope="col">Secret</th>
+                            <th scope="col"></th>
+                            <th scope="col"></th>
                         </tr>
                     </thead>
 
diff --git a/resources/assets/js/components/passport/PersonalAccessTokens.vue b/resources/assets/js/components/passport/PersonalAccessTokens.vue
index 4b173696e4..ea3b26df24 100644
--- a/resources/assets/js/components/passport/PersonalAccessTokens.vue
+++ b/resources/assets/js/components/passport/PersonalAccessTokens.vue
@@ -45,10 +45,11 @@
 
                     <!-- Personal Access Tokens -->
                     <table class="table table-borderless m-b-none" v-if="tokens.length > 0">
+                        <caption>Personal Access Tokens</caption>
                         <thead>
                             <tr>
-                                <th>Name</th>
-                                <th></th>
+                                <th scope="col">Name</th>
+                                <th scope="col"></th>
                             </tr>
                         </thead>