Skip to content

Commit

Permalink
Merge pull request #12 from avo-hq/refactor/avo-3
Browse files Browse the repository at this point in the history
  • Loading branch information
@adrianthedev
adrianthedev committed May 10, 2023
2 parents e05262d + e8c8af4 commit bd78f69
Show file tree
Hide file tree
Showing 57 changed files with 1,007 additions and 712 deletions.
27 changes: 24 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,30 @@ gem 'dotenv-rails', groups: [ :development, :test ]

gem "awesome_print"

gem 'avo'
# gem 'avo', '2.21.1.pre.pr1476'
# gem 'avo'
# gem 'avo', '2.30'
# gem 'avo', git: 'https://github.com/Paul-Bob/avo', branch: 'fix/secret_key_base'
# gem 'avo', path: '.'
# gem 'avo', path: '/Users/adrian/work/avocado/gems/avo'
# gem 'avo_pro', path: '/Users/adrian/work/avocado/gems/avo_pro'
# gem 'avo', '2.28.2.pre.pr1642'
# source "https://rubygems.pkg.github.com/avo-hq" do
# source "https://heheheh@packager.dev/avo" do
# gem "avo", path: "./avo"
source "https://#{ENV['AVO_GEM_TOKEN']}@packager.fly.dev/avo-hq-beta/" do
gem "avo", "3.0.0.pre.6"
gem "avo_pro"
gem "avo_advanced"
gem "avo_filters"
gem "avo_menu"
gem "avo_dashboards"
end

# gem "avo", path: "/Users/adrian/work/avocado/gems/avo"
# gem "avo_pro", path: "/Users/adrian/work/avocado/gems/avo_pro"
# gem "avo_advanced", path: "/Users/adrian/work/avocado/gems/avo_advanced"
# gem "avo_filters", path: "/Users/adrian/work/avocado/gems/avo_filters"
# gem "avo_menu", path: "/Users/adrian/work/avocado/gems/avo_menu"
# gem "avo_dashboards", path: "/Users/adrian/work/avocado/gems/avo_dashboards"

gem 'newrelic_rpm'

Expand All @@ -115,3 +135,4 @@ gem 'chartkick'
gem 'countries'
gem 'sprockets'
gem 'activestorage'
gem 'mapkick-rb'
207 changes: 139 additions & 68 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,114 @@
GEM
remote: https://a1c254a4-6687-4523-bcf2-cd3dfca2b1cf@packager.fly.dev/avo-hq-beta/
specs:
avo (3.0.0.pre6)
actionview (>= 6.1)
active_link_to
activerecord (>= 6.1)
addressable
docile
dry-initializer
httparty
inline_svg
meta-tags
pagy
turbo-rails
view_component (>= 3.0.0)
zeitwerk (>= 2.6.2)
avo_advanced (0.1.49)
avo
rails (>= 6.1.0)
zeitwerk
avo_dashboards (0.1.3)
avo
rails (>= 6.1.0)
turbo-rails
view_component
zeitwerk
avo_filters (0.5.7)
avo
rails (>= 6.1.0)
ransack
view_component
zeitwerk
avo_menu (0.1.9)
avo
docile
dry-initializer
rails (>= 6.1.0)
zeitwerk
avo_pro (0.1.50)
avo
rails (>= 6.1.0)
zeitwerk

GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.4)
actionpack (= 7.0.4)
activesupport (= 7.0.4)
actioncable (7.0.4.3)
actionpack (= 7.0.4.3)
activesupport (= 7.0.4.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (7.0.4)
actionpack (= 7.0.4)
actionview (= 7.0.4)
activejob (= 7.0.4)
activesupport (= 7.0.4)
actionmailbox (7.0.4.3)
actionpack (= 7.0.4.3)
activejob (= 7.0.4.3)
activerecord (= 7.0.4.3)
activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.4.3)
actionpack (= 7.0.4.3)
actionview (= 7.0.4.3)
activejob (= 7.0.4.3)
activesupport (= 7.0.4.3)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.4)
actionview (= 7.0.4)
activesupport (= 7.0.4)
actionpack (7.0.4.3)
actionview (= 7.0.4.3)
activesupport (= 7.0.4.3)
rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (7.0.4)
activesupport (= 7.0.4)
actiontext (7.0.4.3)
actionpack (= 7.0.4.3)
activerecord (= 7.0.4.3)
activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.4.3)
activesupport (= 7.0.4.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_link_to (1.0.5)
actionpack
addressable
activejob (7.0.4)
activesupport (= 7.0.4)
activejob (7.0.4.3)
activesupport (= 7.0.4.3)
globalid (>= 0.3.6)
activemodel (7.0.4)
activesupport (= 7.0.4)
activerecord (7.0.4)
activemodel (= 7.0.4)
activesupport (= 7.0.4)
activestorage (7.0.4)
actionpack (= 7.0.4)
activejob (= 7.0.4)
activerecord (= 7.0.4)
activesupport (= 7.0.4)
activemodel (7.0.4.3)
activesupport (= 7.0.4.3)
activerecord (7.0.4.3)
activemodel (= 7.0.4.3)
activesupport (= 7.0.4.3)
activestorage (7.0.4.3)
actionpack (= 7.0.4.3)
activejob (= 7.0.4.3)
activerecord (= 7.0.4.3)
activesupport (= 7.0.4.3)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.4)
activesupport (7.0.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand All @@ -56,27 +117,13 @@ GEM
activerecord (>= 6.0, < 7.1)
acts_as_list (1.0.4)
activerecord (>= 4.2)
addressable (2.8.1)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
annotate (3.2.0)
activerecord (>= 3.2, < 8.0)
rake (>= 10.4, < 14.0)
appsignal (3.0.26)
rack
avo (2.30.0)
actionview (>= 6.0)
active_link_to
activerecord (>= 6.0)
addressable
docile
dry-initializer
httparty
inline_svg
meta-tags
pagy
turbo-rails
view_component
zeitwerk (>= 2.6.2)
awesome_print (1.9.2)
aws-eventstream (1.2.0)
aws-partitions (1.580.0)
Expand Down Expand Up @@ -112,10 +159,11 @@ GEM
xpath (~> 3.2)
chartkick (4.2.1)
childprocess (4.1.0)
concurrent-ruby (1.2.0)
concurrent-ruby (1.2.2)
countries (5.1.2)
sixarm_ruby_unaccent (~> 1.1)
crass (1.0.6)
date (3.3.3)
debug (1.5.0)
irb (>= 1.3.6)
reline (>= 0.2.7)
Expand Down Expand Up @@ -147,7 +195,7 @@ GEM
httparty (0.21.0)
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
i18n (1.12.0)
i18n (1.13.0)
concurrent-ruby (~> 1.0)
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
Expand All @@ -165,11 +213,14 @@ GEM
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jmespath (1.6.1)
loofah (2.19.1)
loofah (2.20.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
mapkick-rb (0.1.4)
marcel (1.0.2)
matrix (0.4.2)
Expand All @@ -178,53 +229,68 @@ GEM
method_source (1.0.0)
mini_magick (4.11.0)
mini_mime (1.1.2)
minitest (5.17.0)
minitest (5.18.0)
msgpack (1.5.1)
multi_xml (0.6.0)
net-imap (0.3.1)
net-imap (0.3.4)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.1.3)
net-protocol (0.2.1)
timeout
net-smtp (0.3.2)
net-smtp (0.3.3)
net-protocol
newrelic_rpm (8.6.0)
nio4r (2.5.8)
nokogiri (1.14.0-arm64-darwin)
nio4r (2.5.9)
nokogiri (1.14.3-arm64-darwin)
racc (~> 1.4)
nokogiri (1.14.0-x86_64-darwin)
nokogiri (1.14.3-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.14.0-x86_64-linux)
nokogiri (1.14.3-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
pagy (6.0.3)
pagy (6.0.4)
pg (1.3.5)
public_suffix (5.0.1)
puma (5.6.4)
nio4r (~> 2.0)
pundit (2.2.0)
activesupport (>= 3.0.0)
racc (1.6.2)
rack (2.2.6.2)
rack-test (2.0.2)
rack (2.2.7)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.4.3)
actioncable (= 7.0.4.3)
actionmailbox (= 7.0.4.3)
actionmailer (= 7.0.4.3)
actionpack (= 7.0.4.3)
actiontext (= 7.0.4.3)
actionview (= 7.0.4.3)
activejob (= 7.0.4.3)
activemodel (= 7.0.4.3)
activerecord (= 7.0.4.3)
activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
bundler (>= 1.15.0)
railties (= 7.0.4.3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
railties (7.0.4)
actionpack (= 7.0.4)
activesupport (= 7.0.4)
railties (7.0.4.3)
actionpack (= 7.0.4.3)
activesupport (= 7.0.4.3)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rake (13.0.6)
ransack (3.1.0)
activerecord (>= 6.0.4)
activesupport (>= 6.0.4)
ransack (4.0.0)
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
redis (4.6.0)
regexp_parser (2.3.1)
Expand Down Expand Up @@ -258,14 +324,14 @@ GEM
tailwindcss-rails (2.0.8-x86_64-linux)
railties (>= 6.0.0)
thor (1.2.1)
timeout (0.3.0)
turbo-rails (1.3.2)
timeout (0.3.2)
turbo-rails (1.4.0)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
tzinfo (2.0.5)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
view_component (2.82.0)
view_component (3.0.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
Expand All @@ -285,7 +351,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.6)
zeitwerk (2.6.8)

PLATFORMS
arm64-darwin-21
Expand All @@ -300,7 +366,12 @@ DEPENDENCIES
acts_as_list
annotate
appsignal
avo
avo (= 3.0.0.pre.6)!
avo_advanced!
avo_dashboards!
avo_filters!
avo_menu!
avo_pro!
awesome_print
aws-sdk-s3
bootsnap
Expand Down
2 changes: 1 addition & 1 deletion app/avo/actions/dummy_action.rb → app/avo/actions/dummy.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class DummyAction < Avo::BaseAction
class Avo::Actions::Dummy < Avo::BaseAction
self.name = "Dummy action"
self.standalone = true
self.visible = -> { view == :index }
Expand Down
Loading

0 comments on commit bd78f69

Please sign in to comment.