Skip to content

Commit

Permalink
Merge branch 'feature/custom_map_markers' of github.com:avo-hq/avo in…
Browse files Browse the repository at this point in the history
…to feature/custom_map_markers
  • Loading branch information
Paul-Bob committed Jul 8, 2024
2 parents eda9ff4 + faba4dc commit d52e96e
Show file tree
Hide file tree
Showing 19 changed files with 1,628 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Appraisals
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
["3.1.4", "3.3.0"].each do |ruby_version|
["6.1", "7.1"].each do |rails_version|
["6.1", "7.1", "7.2.0.beta2"].each do |rails_version|
appraise "rails-#{rails_version}-ruby-#{ruby_version}" do
gem "psych", "< 4"
gem "rails", "~> #{rails_version}"
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ GIT
PATH
remote: .
specs:
avo (3.10.1)
avo (3.10.2)
actionview (>= 6.1)
active_link_to
activerecord (>= 6.1)
Expand Down
53 changes: 38 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,49 @@
[![Gem Version](https://badge.fury.io/rb/avo.svg)](https://badge.fury.io/rb/avo)
![Tests](https://github.com/avo-hq/avo/workflows/Tests/badge.svg)
![reviewdog](https://github.com/avo-hq/avo/workflows/reviewdog/badge.svg)
[![System Tests](https://github.com/avo-hq/avo/actions/workflows/system-tests.yml/badge.svg)](https://github.com/avo-hq/avo/actions/workflows/system-tests.yml)
[![Feature Tests](https://github.com/avo-hq/avo/actions/workflows/feature-tests.yml/badge.svg)](https://github.com/avo-hq/avo/actions/workflows/feature-tests.yml)
[![Lint](https://github.com/avo-hq/avo/actions/workflows/lint.yml/badge.svg)](https://github.com/avo-hq/avo/actions/workflows/lint.yml)
<a href="https://github.com/avo-hq/avo/discussions" target="_blank">
<img alt="GitHub Discussions" src="https://img.shields.io/github/discussions/avo-hq/avo?color=168AFE&logo=github">
</a>
<a href="https://github.com/avo-hq/avo/issues" target="_blank">
<img alt="GitHub Issues or Pull Requests" src="https://img.shields.io/github/issues-closed/avo-hq/avo?style=flat&link=https%3A%2F%2Fgithub.com%2Favo-hq%2Favo%2Fissues&logo=github">
</a>
<a href="https://rubygems.org/gems/avo">
<img alt="GEM Downloads" src="https://img.shields.io/gem/dt/avo?color=168AFE&logo=ruby&logoColor=FE1616">
</a>
<a href="https://github.com/testdouble/standard">
<img alt="Ruby Style" src="https://img.shields.io/badge/style-standard-168AFE?logo=ruby&logoColor=FE1616" />
</a>
<a href="https://discord.com/invite/vuuwFe4Km3">
<img alt="Avo Rails Admin Discord Community" src="https://img.shields.io/discord/740892036978442260?color=8892F6&label=discord&logo=discord&logoColor=8892F6">
</a>
[![codecov](https://codecov.io/gh/avo-hq/avo/branch/master/graph/badge.svg?token=Q2LMFE4989)](https://codecov.io/gh/avo-hq/avo)
[![Maintainability](https://api.codeclimate.com/v1/badges/676a0afa2cc79f03aa29/maintainability)](https://codeclimate.com/github/avo-hq/avo/maintainability)
[![Open Source Helpers](https://www.codetriage.com/avo-hq/avo/badges/users.svg)](https://www.codetriage.com/avo-hq/avo)

![](./public/avo-assets/logo-on-white.png)

**Ruby on Rails application building framework.**
**<a href="https://avohq.io" title="Ruby on Rails Admin Panel Framework">Avo - Ruby on Rails Admin Panel Framework</a>**

Avo is a beautiful next-generation framework that empowers you, the developer, to create fantastic admin panels for your Ruby on Rails apps with the flexibility to fit your needs as you grow.
Avo is a very custom Admin Panel Framework, Content Management System, and Internal Tool Builder for Ruby on Rails that saves engineers and teams **months of development time**.

## Get started

⚡️ **Install**: [docs.avohq.io/3.0/installation](https://docs.avohq.io/3.0/installation.html)\
**Website**: [avohq.io](https://avohq.io)\
📚 **Documentation**: [docs.avohq.io](https://docs.avohq.io)\
🗺 **Roadmap**: [GitHub Roadmap](https://github.com/orgs/avo-hq/projects/8)\
🎸 **Demo app**: [Avodemo](https://main.avodemo.com/)\
🐤 **Twitter**: [avo_hq](https://twitter.com/avo_hq)\
💬 **Community chat**: [discord](https://discord.gg/pkTF6y8)\
🔧 **Issue tracker**: [GitHub issues](http://github.com/avo-hq/avo/issues)\
⚡️ **Install**: [docs.avohq.io/3.0/installation](https://docs.avohq.io/3.0/installation.html)
<br>
**Website**: [avohq.io](https://avohq.io)
<br>
📚 **Documentation**: [docs.avohq.io](https://docs.avohq.io)
<br>
🗺 **Roadmap**: [GitHub Roadmap](https://github.com/orgs/avo-hq/projects/14)
<br>
🎸 **Demo app**: [Avodemo](https://main.avodemo.com/)
<br>
🐤 **Twitter**: [avo_hq](https://twitter.com/avo_hq)
<br>
💬 **Community chat**: [discord](https://discord.gg/pkTF6y8)
<br>
🔧 **Issue tracker**: [GitHub issues](http://github.com/avo-hq/avo/issues)
<br>
🎙 **Discussions and feature requests**: [GitHub issues](http://github.com/avo-hq/avo/discussions)

## Features
Expand Down Expand Up @@ -50,9 +73,9 @@ Avo is a beautiful next-generation framework that empowers you, the developer, t

## Some of the things we're going to focus on next

Theming ⭐️ &nbsp;notifications ⭐️ &nbsp;Resource segmentation ⭐️ &nbsp;filterable fields ⭐️ &nbsp;inline editing ⭐️ &nbsp;multilingual records ⭐️ &nbsp;keyboard shortcuts ⭐️ &nbsp;track resource changes ⭐️ &nbsp;smart resource generation ⭐️ &nbsp;live resources ⭐️ &nbsp;columns view ⭐️ &nbsp;list view ⭐️ &nbsp;custom action items ⭐️ &nbsp;command bar ⭐️ &nbsp; use fields DSL in your custom views
Theming ⭐️ &nbsp;notifications ⭐️ &nbsp;Resource segmentation ⭐️ &nbsp;inline editing ⭐️ &nbsp;multilingual records ⭐️ &nbsp;keyboard shortcuts ⭐️ &nbsp;track resource changes ⭐️ &nbsp;live resources ⭐️ &nbsp;columns view ⭐️ &nbsp;list view ⭐️ &nbsp;custom action items ⭐️ &nbsp;command bar

For more up-to-date info check out our 🗺 [Roadmap](https://github.com/orgs/avo-hq/projects/8).
For more up-to-date info check out our 🗺 [Roadmap](https://github.com/orgs/avo-hq/projects/14).

# Installation

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<% if file.present? %>
<div class="flex flex-col h-full">
<% if file.representable? && is_image? %>
<%= image_tag helpers.main_app.url_for(file), class: "rounded-lg max-w-full self-start #{@extra_classes}" %>
<%= image_tag helpers.main_app.url_for(file), class: "rounded-lg max-w-full self-start #{@extra_classes}", loading: :lazy, width: file.metadata["width"], height: file.metadata["height"] %>
<% elsif is_audio? %>
<%= audio_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
<% elsif is_video? %>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="absolute bg-gray-50 w-full h-full">
<%= image_tag Avo.configuration.branding.placeholder, class: 'relative transform -translate-x-1/2 -translate-y-1/2 h-20 text-gray-400 inset-auto top-1/2 left-1/2' %>
<%= image_tag Avo.configuration.branding.placeholder, class: "relative transform -translate-x-1/2 -translate-y-1/2 h-20 text-gray-400 inset-auto top-1/2 left-1/2", loading: :lazy %>
</div>
2 changes: 1 addition & 1 deletion app/components/avo/index/grid_item_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def render_cover
def link_to_cover
classes = "absolute h-full w-full object-cover"

link_to image_tag(@card[:cover_url], class: classes), resource_view_path, class: classes, title: @card[:title]
link_to image_tag(@card[:cover_url], class: classes), resource_view_path, class: classes, title: @card[:title], loading: :lazy, width: "640", height: "480"
end

def render_title
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ GEM

PLATFORMS
arm64-darwin-23
x86_64-linux

DEPENDENCIES
active_link_to
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_6.1_ruby_3.3.0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ GEM

PLATFORMS
arm64-darwin-23
x86_64-linux

DEPENDENCIES
active_link_to
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,7 @@ GEM

PLATFORMS
arm64-darwin-23
x86_64-linux

DEPENDENCIES
active_link_to
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,7 @@ GEM

PLATFORMS
arm64-darwin-23
x86_64-linux

DEPENDENCIES
active_link_to
Expand Down
93 changes: 93 additions & 0 deletions gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "jsbundling-rails"
gem "cssbundling-rails"
gem "rails", "~> 7.2.0.beta2"
gem "activestorage"
gem "pg", ">= 0.18", "< 2.0"
gem "puma", "~> 6.4"
gem "redis", "~> 5.0"
gem "bootsnap", ">= 1.4.2", require: false
gem "byebug", platforms: [:mri, :mingw, :x64_mingw]
gem "dotenv-rails"
gem "web-console", ">= 3.3.0"
gem "listen", ">= 3.5.1"
gem "spring"
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem "devise"
gem "awesome_print"
gem "zeitwerk"
gem "httparty"
gem "iso"
gem "active_link_to"
gem "addressable"
gem "meta-tags"
gem "ransack", "~> 4.1", ">= 4.1.1"
gem "friendly_id", "~> 5.5.1"
gem "aws-sdk-s3", require: false
gem "net-smtp", require: false
gem "groupdate"
gem "hightop"
gem "active_median"
gem "acts_as_list"
gem "acts-as-taggable-on", git: "https://github.com/avo-hq/acts-as-taggable-on.git"
gem "bundler-integrity", "~> 1.0"
gem "countries"
gem "chartkick"
gem "sprockets-rails"
gem "image_processing", "~> 1.12"
gem "prefixed_ids"
gem "mapkick-rb", "~> 0.1.4"
gem "pluggy", path: "../pluggy"
gem "money-rails", "~> 1.12"
gem "avo-money_field"
gem "avo-record_link_field"
gem "pagy", "> 8"
gem "csv"
gem "psych", "< 4"

group :development do
gem "standard"
gem "bump", require: false
gem "gem-release", require: false
gem "annotate"
gem "htmlbeautifier"
gem "hotwire-livereload", "~> 1.3.0"
gem "rubocop"
gem "ripper-tags"
gem "rubocop-shopify", require: false
gem "rubycritic", require: false
gem "actual_db_schema"
end

group :test do
gem "rspec-rails", "~> 6.0", ">= 6.0.3"
gem "rspec-retry", "~> 0.6.2"
gem "rails-controller-testing"
gem "capybara"
gem "cuprite"
gem "fuubar"
gem "simplecov", require: false
gem "simplecov-cobertura"
gem "simplecov-lcov"
gem "webmock"
gem "spring-commands-rspec"
gem "launchy", require: false
gem "test-prof"
gem "database_cleaner-active_record"
end

group :development, :test do
gem "faker", require: false
gem "i18n-tasks", "~> 1.0.12"
gem "erb-formatter"
gem "erb_lint"
gem "solargraph"
gem "solargraph-rails"
gem "factory_bot_rails"
gem "appraisal"
end

gemspec path: "../"
Loading

0 comments on commit d52e96e

Please sign in to comment.