mirror of
https://github.com/maybe-finance/maybe.git
synced 2025-08-05 05:25:24 +02:00
Merge pull request #249 from robzolkos/use-main-turbo
Use turbo from main branch (with new morphing bits)
This commit is contained in:
commit
41eb777843
4 changed files with 18 additions and 11 deletions
2
Gemfile
2
Gemfile
|
@ -18,7 +18,7 @@ gem "puma", ">= 5.0"
|
|||
gem "importmap-rails"
|
||||
|
||||
# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
|
||||
gem "turbo-rails"
|
||||
gem "turbo-rails", github: "hotwired/turbo-rails", branch: "main"
|
||||
|
||||
# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
|
||||
gem "stimulus-rails"
|
||||
|
|
16
Gemfile.lock
16
Gemfile.lock
|
@ -1,3 +1,13 @@
|
|||
GIT
|
||||
remote: https://github.com/hotwired/turbo-rails.git
|
||||
revision: 3748512710a29b541a1f2b3863cc6fb2422fb7e2
|
||||
branch: main
|
||||
specs:
|
||||
turbo-rails (2.0.0.pre.rc.2)
|
||||
actionpack (>= 6.0.0)
|
||||
activejob (>= 6.0.0)
|
||||
railties (>= 6.0.0)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/rails/rails.git
|
||||
revision: e09e61af0d4aa7c0e5e138c52a194e316449b51a
|
||||
|
@ -308,10 +318,6 @@ GEM
|
|||
railties (>= 6.0.0)
|
||||
thor (1.3.0)
|
||||
timeout (0.4.1)
|
||||
turbo-rails (1.5.0)
|
||||
actionpack (>= 6.0.0)
|
||||
activejob (>= 6.0.0)
|
||||
railties (>= 6.0.0)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
unicode-display_width (2.5.0)
|
||||
|
@ -360,7 +366,7 @@ DEPENDENCIES
|
|||
selenium-webdriver
|
||||
stimulus-rails
|
||||
tailwindcss-rails
|
||||
turbo-rails
|
||||
turbo-rails!
|
||||
tzinfo-data
|
||||
web-console
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
class Account < ApplicationRecord
|
||||
VALID_ACCOUNT_TYPES = %w[Investment Depository Credit Loan Property Vehicle OtherAsset OtherLiability].freeze
|
||||
|
||||
|
||||
belongs_to :family
|
||||
|
||||
scope :depository, -> { where(type: 'Depository') }
|
||||
scope :depository, -> { where(type: "Depository") }
|
||||
end
|
||||
|
|
|
@ -6,12 +6,10 @@
|
|||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
|
||||
<meta name="apple-mobile-web-app-title" content="Maybe">
|
||||
|
||||
|
||||
<%= csrf_meta_tags %>
|
||||
<%= csp_meta_tag %>
|
||||
|
||||
<%= yield :head %>
|
||||
|
||||
<link rel="manifest" href="/manifest.json">
|
||||
<link rel="icon" href="/icon.png" type="image/png">
|
||||
<link rel="icon" href="/icon.svg" type="image/svg+xml">
|
||||
|
@ -20,6 +18,9 @@
|
|||
<%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
|
||||
<%= javascript_importmap_tags %>
|
||||
<%= hotwire_livereload_tags if Rails.env.development? %>
|
||||
|
||||
<%= turbo_refreshes_with method: :morph, scroll: :preserve %>
|
||||
<%= yield :head %>
|
||||
</head>
|
||||
|
||||
<body class="h-full">
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue