Skip to content

Commit

Permalink
Merge branch 'hotwire'
Browse files Browse the repository at this point in the history
  • Loading branch information
@spohlenz
spohlenz committed Jul 3, 2024
2 parents 3e199d6 + d4b0f81 commit 3f8db22
Show file tree
Hide file tree
Showing 20 changed files with 142 additions and 163 deletions.
6 changes: 3 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ end
gem 'dotenv-rails'

# Trestle admin framework
gem 'trestle', github: 'TrestleAdmin/trestle'
gem 'trestle-auth', github: 'TrestleAdmin/trestle-auth'
gem 'trestle-search', github: 'TrestleAdmin/trestle-search'
gem 'trestle', '~> 0.10.0.pre'
gem 'trestle-auth', '~> 0.5.0.pre'
gem 'trestle-search', '~> 0.5.0.pre'

# Model search
gem 'pg_search'
Expand Down
188 changes: 87 additions & 101 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,92 +1,67 @@
GIT
remote: https://github.com/TrestleAdmin/trestle-auth.git
revision: 6750252e2ec6f8c2e89d7f67426bddb0633768b0
specs:
trestle-auth (0.4.4)
bcrypt (~> 3.1.7)
trestle (~> 0.9.0, >= 0.9.3)

GIT
remote: https://github.com/TrestleAdmin/trestle-search.git
revision: 026f36eec8ef0d794fc829ce9545b5e9d6dd1e57
specs:
trestle-search (0.4.3)
trestle (~> 0.9.0, >= 0.9.3)

GIT
remote: https://github.com/TrestleAdmin/trestle.git
revision: 27e731c5980cf62a86800ea71d9f7d646ebbd724
specs:
trestle (0.9.9)
activemodel (>= 5.2.0)
kaminari (>= 1.1.0)
railties (>= 5.2.0)
sprockets-rails (>= 2.0.0)

GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.8.3)
actionpack (= 7.0.8.3)
activesupport (= 7.0.8.3)
actioncable (7.0.8.4)
actionpack (= 7.0.8.4)
activesupport (= 7.0.8.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.8.3)
actionpack (= 7.0.8.3)
activejob (= 7.0.8.3)
activerecord (= 7.0.8.3)
activestorage (= 7.0.8.3)
activesupport (= 7.0.8.3)
actionmailbox (7.0.8.4)
actionpack (= 7.0.8.4)
activejob (= 7.0.8.4)
activerecord (= 7.0.8.4)
activestorage (= 7.0.8.4)
activesupport (= 7.0.8.4)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.8.3)
actionpack (= 7.0.8.3)
actionview (= 7.0.8.3)
activejob (= 7.0.8.3)
activesupport (= 7.0.8.3)
actionmailer (7.0.8.4)
actionpack (= 7.0.8.4)
actionview (= 7.0.8.4)
activejob (= 7.0.8.4)
activesupport (= 7.0.8.4)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.8.3)
actionview (= 7.0.8.3)
activesupport (= 7.0.8.3)
actionpack (7.0.8.4)
actionview (= 7.0.8.4)
activesupport (= 7.0.8.4)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.8.3)
actionpack (= 7.0.8.3)
activerecord (= 7.0.8.3)
activestorage (= 7.0.8.3)
activesupport (= 7.0.8.3)
actiontext (7.0.8.4)
actionpack (= 7.0.8.4)
activerecord (= 7.0.8.4)
activestorage (= 7.0.8.4)
activesupport (= 7.0.8.4)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.8.3)
activesupport (= 7.0.8.3)
actionview (7.0.8.4)
activesupport (= 7.0.8.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.8.3)
activesupport (= 7.0.8.3)
activejob (7.0.8.4)
activesupport (= 7.0.8.4)
globalid (>= 0.3.6)
activemodel (7.0.8.3)
activesupport (= 7.0.8.3)
activerecord (7.0.8.3)
activemodel (= 7.0.8.3)
activesupport (= 7.0.8.3)
activestorage (7.0.8.3)
actionpack (= 7.0.8.3)
activejob (= 7.0.8.3)
activerecord (= 7.0.8.3)
activesupport (= 7.0.8.3)
activemodel (7.0.8.4)
activesupport (= 7.0.8.4)
activerecord (7.0.8.4)
activemodel (= 7.0.8.4)
activesupport (= 7.0.8.4)
activestorage (7.0.8.4)
actionpack (= 7.0.8.4)
activejob (= 7.0.8.4)
activerecord (= 7.0.8.4)
activesupport (= 7.0.8.4)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.8.3)
activesupport (7.0.8.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand All @@ -95,8 +70,8 @@ GEM
bindex (0.8.1)
bootsnap (1.18.3)
msgpack (~> 1.2)
builder (3.2.4)
concurrent-ruby (1.2.3)
builder (3.3.0)
concurrent-ruby (1.3.3)
crass (1.0.6)
date (3.3.4)
debug (1.9.2)
Expand All @@ -107,18 +82,20 @@ GEM
dotenv-rails (3.1.2)
dotenv (= 3.1.2)
railties (>= 6.1)
erubi (1.12.0)
erubi (1.13.0)
execjs (2.9.1)
ffi (1.16.3)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
globalid (1.2.1)
activesupport (>= 6.1)
http-accept (1.7.0)
http-cookie (1.0.5)
http-cookie (1.0.6)
domain_name (~> 0.5)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
irb (1.13.1)
irb (1.13.2)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jsbundling-rails (1.3.0)
Expand Down Expand Up @@ -147,11 +124,11 @@ GEM
method_source (1.1.0)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0507)
mime-types-data (3.2024.0604)
mini_mime (1.1.5)
minitest (5.23.1)
minitest (5.24.1)
msgpack (1.7.2)
net-imap (0.4.11)
net-imap (0.4.14)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -162,11 +139,11 @@ GEM
net-protocol
netrc (0.11.0)
nio4r (2.7.3)
nokogiri (1.16.5-arm64-darwin)
nokogiri (1.16.6-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.5-x86_64-darwin)
nokogiri (1.16.6-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.5-x86_64-linux)
nokogiri (1.16.6-x86_64-linux)
racc (~> 1.4)
pg (1.5.6)
pg_search (2.3.6)
Expand All @@ -180,38 +157,38 @@ GEM
rack (2.2.9)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.8.3)
actioncable (= 7.0.8.3)
actionmailbox (= 7.0.8.3)
actionmailer (= 7.0.8.3)
actionpack (= 7.0.8.3)
actiontext (= 7.0.8.3)
actionview (= 7.0.8.3)
activejob (= 7.0.8.3)
activemodel (= 7.0.8.3)
activerecord (= 7.0.8.3)
activestorage (= 7.0.8.3)
activesupport (= 7.0.8.3)
rails (7.0.8.4)
actioncable (= 7.0.8.4)
actionmailbox (= 7.0.8.4)
actionmailer (= 7.0.8.4)
actionpack (= 7.0.8.4)
actiontext (= 7.0.8.4)
actionview (= 7.0.8.4)
activejob (= 7.0.8.4)
activemodel (= 7.0.8.4)
activerecord (= 7.0.8.4)
activestorage (= 7.0.8.4)
activesupport (= 7.0.8.4)
bundler (>= 1.15.0)
railties (= 7.0.8.3)
railties (= 7.0.8.4)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.0.8.3)
actionpack (= 7.0.8.3)
activesupport (= 7.0.8.3)
railties (7.0.8.4)
actionpack (= 7.0.8.4)
activesupport (= 7.0.8.4)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rake (13.2.1)
rdoc (6.6.3.1)
rdoc (6.7.0)
psych (>= 4.0.0)
reline (0.5.7)
reline (0.5.9)
io-console (~> 0.5)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
Expand All @@ -229,16 +206,25 @@ GEM
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets-rails (3.5.1)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
stringio (3.1.0)
stringio (3.1.1)
themoviedb-api (1.4.1)
rest-client (~> 2.1)
thor (1.3.1)
tilt (2.3.0)
tilt (2.4.0)
timeout (0.4.1)
trestle (0.10.0.pre)
activemodel (>= 5.2.0)
kaminari (>= 1.1.0)
railties (>= 5.2.0)
trestle-auth (0.5.0.pre)
bcrypt (~> 3.1.7)
trestle (~> 0.10.0.pre)
trestle-search (0.5.0.pre)
trestle (~> 0.10.0.pre)
turbo-rails (2.0.5)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
Expand All @@ -255,7 +241,7 @@ GEM
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.6.14)
zeitwerk (2.6.16)

PLATFORMS
arm64-darwin-22
Expand All @@ -275,9 +261,9 @@ DEPENDENCIES
sassc-rails (~> 2.1)
sprockets-rails
themoviedb-api
trestle!
trestle-auth!
trestle-search!
trestle (~> 0.10.0.pre)
trestle-auth (~> 0.5.0.pre)
trestle-search (~> 0.5.0.pre)
turbo-rails
uglifier (>= 1.3.0)
web-console
Expand Down
4 changes: 2 additions & 2 deletions app/admin/acting_credits_admin.rb
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Trestle.resource(:acting_credits) do
form dialog: true do |credit|
form modal: true do |credit|
row do
col(sm: 4) do
form_group :profile, label: false do
link_to image_tag(credit.profile_url), credit.profile_url, data: { behavior: "zoom" }
link_to image_tag(credit.profile_url), credit.profile_url, data: { controller: "lightbox" }
end if credit.profile?
end

Expand Down
4 changes: 2 additions & 2 deletions app/admin/crew_credits_admin.rb
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Trestle.resource(:crew_credits) do
form dialog: true do |credit|
form modal: true do |credit|
row do
col(sm: 4) do
form_group :profile, label: false do
link_to image_tag(credit.profile_url), credit.profile_url, data: { behavior: "zoom" }
link_to image_tag(credit.profile_url), credit.profile_url, data: { controller: "lightbox" }
end if credit.profile?
end

Expand Down
2 changes: 1 addition & 1 deletion app/admin/genres_admin.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
actions
end

form dialog: true do |genre|
form modal: true do |genre|
select :type, { "Movie" => "Movie::Genre", "TV Show" => "TVShow::Genre" }
text_field :name
end
Expand Down
2 changes: 1 addition & 1 deletion app/admin/movies_admin.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@

sidebar do
form_group :poster, label: false do
link_to image_tag(movie.poster_url("w500")), movie.poster_url, data: { behavior: "zoom" }
link_to image_tag(movie.poster_url("w500")), movie.poster_url, data: { controller: "lightbox" }
end if movie.poster?

static_field :tmdb, label: "TheMovieDB.org" do
Expand Down
6 changes: 3 additions & 3 deletions app/admin/people_admin.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
end

sort_column(:credits_count) do |collection, order|
collection.reorder("credits_count #{order}")
collection.reorder(credits_count: order)
end

table do
Expand All @@ -33,11 +33,11 @@
actions
end

form dialog: true do |actor|
form modal: true do |actor|
row do
col(sm: 4) do
form_group :profile, label: false do
link_to image_tag(actor.profile_url), actor.profile_url, data: { behavior: "zoom" }
link_to image_tag(actor.profile_url), actor.profile_url, data: { controller: "lightbox" }
end if actor.profile?
end

Expand Down
Loading

0 comments on commit 3f8db22

Please sign in to comment.