Fix merge conflicts from release/v1.7.1

odinsride · Aug 17, 2020 · 950ac7e · 950ac7e
2 parents 3582705 + 80720a9
commit 950ac7e
Show file tree

Hide file tree

Showing 50 changed files with 280 additions and 226 deletions.
diff --git a/.yarnclean b/.yarnclean
@@ -5,11 +5,11 @@ tests
 powered-test
 
 # asset directories
-docs
-doc
-website
-images
-assets
+#docs
+#doc
+##website
+#images
+#assets
 
 # examples
 example

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased] changes
 
+## [v1.7.1] - 2020-08-17
+
+### New
+- User registration, and current user email changes now require email confirmation. This is to prevent false registrations from bots.
+- Version number has been added to footer
+
+### Changed
+- Transaction attachment interface improved to display the filename of the current attachment, as well as corrections to a text overflow issue with long attachment filenames.
+- Favicon has been updated
+
+### Fixed
+- User sign-out no longer causes an error
+- Transactions with long descriptions now display better on mobile
+
 ## [v1.7.0] - 2020-08-06
 
 ### New
@@ -212,7 +226,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Account overview with list of all accounts and balances for each
 
 
-[Unreleased]: https://github.com/odinsride/olubalance/compare/v1.7.0...develop
+[Unreleased]: https://github.com/odinsride/olubalance/compare/v1.7.1...develop
+[v1.7.1]: https://github.com/odinsride/olubalance/compare/v1.7.0...v1.7.1
 [v1.7.0]: https://github.com/odinsride/olubalance/compare/v1.6.4...v1.7.0
 [v1.6.4]: https://github.com/odinsride/olubalance/compare/v1.6.3...v1.6.4
 [v1.6.3]: https://github.com/odinsride/olubalance/compare/v1.6.2...v1.6.3

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -64,7 +64,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.1)
     aws-eventstream (1.1.0)
-    aws-partitions (1.355.0)
+    aws-partitions (1.356.0)
     aws-sdk-core (3.104.3)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -258,7 +258,7 @@ GEM
     semantic_range (2.3.0)
     shoulda-matchers (4.3.0)
       activesupport (>= 4.2.0)
-    simplecov (0.18.5)
+    simplecov (0.19.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.2)

diff --git a/app/decorators/transaction_decorator.rb b/app/decorators/transaction_decorator.rb
@@ -82,7 +82,11 @@ def created_at_decorated
     created_at.in_time_zone(current_user.timezone).strftime('%b %d, %Y @ %I:%M %p %Z')
   end
 
-  def trx_line_desc_mobile
-    description.length > 35 ? description[0..35] + '...' : description
+  def name_too_long
+    description.length > 35
+  end
+
+  def trx_desc_display
+    name_too_long ? description[0..35] + '...' : description
   end
 end
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
@@ -1,6 +1,7 @@
 // Core libraries
 require("turbolinks").start()
 require("@rails/ujs").start()
+require("@rails/actioncable")
 require("@rails/activestorage").start()
 require("channels")
 require.context("../application/images", true)

diff --git a/app/views/accounts/components/_accountCardContent.html.erb b/app/views/accounts/components/_accountCardContent.html.erb
@@ -1,9 +1,8 @@
-<header class="card-header has-background-primary <%= class_string(tooltip: account.name_too_long) %>"
-  data-tooltip="<%= account.name %>">
+<%= content_tag :header, class: "card-header has-background-primary", data: { tooltip: account.name_too_long ? account.name : nil } do -%>
   <h6 class="title is-6 card-header-title has-text-white">
     <%= account.account_card_title %>
   </h6>
-</header>
+<% end %>
 <div class="card-content">
   <div class="content has-text-right ">
     <p class="title is-6 has-text-link">

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -7,23 +7,16 @@
 
     <title>olubalance</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png">
-    <link rel="icon" type="image/png" sizes="192x192"  href="/android-icon-192x192.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-    <link rel="manifest" href="/manifest.json">
-    <meta name="msapplication-TileColor" content="#ffffff">
-    <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
-    <meta name="theme-color" content="#ffffff">
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=dLXL9YRL6A">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?v=dLXL9YRL6A">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?v=dLXL9YRL6A">
+    <link rel="manifest" href="/site.webmanifest?v=dLXL9YRL6A">
+    <link rel="mask-icon" href="/safari-pinned-tab.svg?v=dLXL9YRL6A" color="#366a64">
+    <link rel="shortcut icon" href="/favicon.ico?v=dLXL9YRL6A">
+    <meta name="apple-mobile-web-app-title" content="olubalance">
+    <meta name="application-name" content="olubalance">
+    <meta name="msapplication-TileColor" content="#366a64">
+    <meta name="theme-color" content="#366a64">
 
     <%= csrf_meta_tags %>
     <%= action_cable_meta_tag %>

diff --git a/app/views/layouts/home.html.erb b/app/views/layouts/home.html.erb
@@ -7,20 +7,16 @@
 
   <title>olubalance</title>
 
-  <link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png">
-  <link rel="apple-touch-icon" sizes="76x76" href="/apple-touch-icon-76x76.png">
-  <link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-120x120.png">
-  <link rel="apple-touch-icon" sizes="152x152" href="/apple-touch-icon-152x152.png">
-  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png">
-  <link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
-  <link rel="icon" type="image/png" href="/android-chrome-144x144.png" sizes="144x144">
-  <link rel="manifest" href="/site.webmanifest">
-  <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
-  <meta name="application-name" content="olubalance">
-  <meta name="msapplication-TileColor" content="#00aba9">
-  <meta name="msapplication-TileImage" content="/mstile-150x150.png">
-  <meta name="theme-color" content="#ffffff">
+  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=dLXL9YRL6A">
+  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?v=dLXL9YRL6A">
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?v=dLXL9YRL6A">
+  <link rel="manifest" href="/site.webmanifest?v=dLXL9YRL6A">
+  <link rel="mask-icon" href="/safari-pinned-tab.svg?v=dLXL9YRL6A" color="#366a64">
+  <link rel="shortcut icon" href="/favicon.ico?v=dLXL9YRL6A">
   <meta name="apple-mobile-web-app-title" content="olubalance">
+  <meta name="application-name" content="olubalance">
+  <meta name="msapplication-TileColor" content="#366a64">
+  <meta name="theme-color" content="#366a64">
 
   <%= csrf_meta_tags %>
 

diff --git a/app/views/shared/_userMenu.html.erb b/app/views/shared/_userMenu.html.erb
@@ -24,7 +24,7 @@
       Inactive Accounts
     <% end %>
 
-    <%= link_to destroy_user_session_path, class: "navbar-item", method: :delete do%>
+    <%= link_to destroy_user_session_path, class: "navbar-item" do%>
       <span class="icon has-text-link is-medium ob-icon-rpad">
         <i class="fas fa-sign-out-alt"></i>
       </span>

diff --git a/app/views/transactions/components/_transactionCard.html.erb b/app/views/transactions/components/_transactionCard.html.erb
@@ -1,8 +1,8 @@
 <div class="card" id="transaction-card">
   <header class="card-header has-background-primary">
-    <p class="card-header-title has-text-white">
-      <%= @transaction.description %>
-    </p>
+    <%= content_tag :p, class: "card-header-title has-text-white", data: { tooltip: @transaction.name_too_long ? @transaction.description : nil } do -%>
+      <%= @transaction.trx_desc_display %>      
+    <% end %>
     <p class="card-header-icon has-text-white has-text-weight-bold">
       <%= @transaction.trx_date_display %>
     </p>

diff --git a/app/views/transactions/components/_transactionLineDesktop.html.erb b/app/views/transactions/components/_transactionLineDesktop.html.erb
@@ -10,7 +10,7 @@
   <td class="">
     <%= link_to account_transaction_path(id: transaction.id) do %>
       <div class="ob-cell-content">
-        <%= transaction.description %>
+        <%= transaction.trx_desc_display %>
         <% if transaction.attachment.attached? then %>
           <span class="icon has-text-grey-light has-tooltip-arrow" data-tooltip="Transaction has attachment">
             <i class="fas fa-sm fa-paperclip"></i>

diff --git a/app/views/transactions/components/_transactionLineMobile.html.erb b/app/views/transactions/components/_transactionLineMobile.html.erb
@@ -5,7 +5,7 @@
       <div class="level ob-mobile-level is-mobile">
         <div class="level-left">
           <div class="level-item">
-            <%= transaction.trx_line_desc_mobile %>
+            <%= transaction.trx_desc_display %>
             <% if transaction.attachment.attached? then %>
               <span class="icon has-text-grey-light tooltip" data-tooltip="Transaction has attachment">
                 <i class="fas fa-sm fa-paperclip"></i>

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -63,7 +63,7 @@
   # config.active_job.queue_name_prefix = "olubalance_#{Rails.env}"
   config.action_mailer.perform_caching = false
 
-  config.action_mailer.default_url_options = { host: 'olubalance.com', port: 3000 }
+  config.action_mailer.default_url_options = { host: 'olubalance.com' }
 
 
   config.action_mailer.delivery_method = :smtp

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -248,7 +248,7 @@
 
   # The default HTTP method used to sign out a resource. Default is :delete.
   # config.sign_out_via = :delete
-  config.sign_out_via = :delete
+  config.sign_out_via = :get
 
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting

diff --git a/public/README.md b/public/README.md
@@ -0,0 +1,24 @@
+# Your Favicon Package
+
+This package was generated with [RealFaviconGenerator](https://realfavicongenerator.net/) [v0.16](https://realfavicongenerator.net/change_log#v0.16)
+
+## Install instructions
+
+To install this package:
+
+Extract this package in the root of your web site. If your site is <code>http://www.example.com</code>, you should be able to access a file named <code>http://www.example.com/favicon.ico</code>.
+
+Insert the following code in the `head` section of your pages:
+
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=dLXL9YRL6A">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?v=dLXL9YRL6A">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?v=dLXL9YRL6A">
+    <link rel="manifest" href="/site.webmanifest?v=dLXL9YRL6A">
+    <link rel="mask-icon" href="/safari-pinned-tab.svg?v=dLXL9YRL6A" color="#366a64">
+    <link rel="shortcut icon" href="/favicon.ico?v=dLXL9YRL6A">
+    <meta name="apple-mobile-web-app-title" content="olubalance">
+    <meta name="application-name" content="olubalance">
+    <meta name="msapplication-TileColor" content="#366a64">
+    <meta name="theme-color" content="#366a64">
+
+*Optional* - Check your favicon with the [favicon checker](https://realfavicongenerator.net/favicon_checker)
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png
diff --git a/public/android-icon-144x144.png b/public/android-icon-144x144.png
diff --git a/public/android-icon-192x192.png b/public/android-icon-192x192.png
diff --git a/public/android-icon-36x36.png b/public/android-icon-36x36.png
diff --git a/public/android-icon-48x48.png b/public/android-icon-48x48.png
diff --git a/public/android-icon-72x72.png b/public/android-icon-72x72.png
diff --git a/public/android-icon-96x96.png b/public/android-icon-96x96.png
diff --git a/public/apple-icon-114x114.png b/public/apple-icon-114x114.png
diff --git a/public/apple-icon-120x120.png b/public/apple-icon-120x120.png
diff --git a/public/apple-icon-144x144.png b/public/apple-icon-144x144.png
diff --git a/public/apple-icon-152x152.png b/public/apple-icon-152x152.png
diff --git a/public/apple-icon-180x180.png b/public/apple-icon-180x180.png
diff --git a/public/apple-icon-57x57.png b/public/apple-icon-57x57.png
diff --git a/public/apple-icon-60x60.png b/public/apple-icon-60x60.png
diff --git a/public/apple-icon-72x72.png b/public/apple-icon-72x72.png
diff --git a/public/apple-icon-76x76.png b/public/apple-icon-76x76.png
diff --git a/public/apple-icon-precomposed.png b/public/apple-icon-precomposed.png
diff --git a/public/apple-icon.png b/public/apple-icon.png
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
diff --git a/public/browserconfig.xml b/public/browserconfig.xml
@@ -1,2 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png?v=dLXL9YRL6A"/>
+            <TileColor>#366a64</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
diff --git a/public/favicon-96x96.png b/public/favicon-96x96.png
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/html_code.html b/public/html_code.html
@@ -0,0 +1,10 @@
+<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=dLXL9YRL6A">
+<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?v=dLXL9YRL6A">
+<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?v=dLXL9YRL6A">
+<link rel="manifest" href="/site.webmanifest?v=dLXL9YRL6A">
+<link rel="mask-icon" href="/safari-pinned-tab.svg?v=dLXL9YRL6A" color="#366a64">
+<link rel="shortcut icon" href="/favicon.ico?v=dLXL9YRL6A">
+<meta name="apple-mobile-web-app-title" content="olubalance">
+<meta name="application-name" content="olubalance">
+<meta name="msapplication-TileColor" content="#366a64">
+<meta name="theme-color" content="#366a64">
diff --git a/public/manifest.json b/public/manifest.json
diff --git a/public/ms-icon-144x144.png b/public/ms-icon-144x144.png
diff --git a/public/ms-icon-150x150.png b/public/ms-icon-150x150.png
diff --git a/public/ms-icon-310x310.png b/public/ms-icon-310x310.png
diff --git a/public/ms-icon-70x70.png b/public/ms-icon-70x70.png
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png