Skip to content

Commit

Permalink
Merge pull request #151 from CMDBrew/v0.3-rc
Browse files Browse the repository at this point in the history
v0.3.0-rc
  • Loading branch information
ilunglee authored Nov 26, 2021
2 parents 21e29bc + f39668f commit cc6641b
Show file tree
Hide file tree
Showing 59 changed files with 1,228 additions and 1,861 deletions.
19 changes: 13 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,24 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [0.2.3](https://github.com/CMDBrew/adminterface/compare/v0.2.2...v0.2.3) (2021-11-09)
## [0.3.0](https://github.com/CMDBrew/adminterface/compare/v0.2.3...v0.3.0) (2021-11-26)


#### Build
### Features

* RTL support ([64459e6](https://github.com/CMDBrew/adminterface/commit/64459e61daa62c5ef736a0cc06328874c7f537bc))

## [0.2.3](https://github.com/CMDBrew/adminterface/compare/v0.2.2...v0.2.3) (2021-11-09)


### Build

* **deps:** bump @popperjs/core to v2.10.2 ([f7cb681](https://github.com/CMDBrew/adminterface/commit/f7cb681cd744e83b0702b732acd58b00a63ccc0a))

### [0.2.2](https://github.com/CMDBrew/adminterface/compare/v0.2.1...v0.2.2) (2021-11-03)
## [0.2.2](https://github.com/CMDBrew/adminterface/compare/v0.2.1...v0.2.2) (2021-11-03)


#### Bug Fixes
### Bug Fixes

* add "aria-current": "page" to active nav link ([6cbc538](https://github.com/CMDBrew/adminterface/commit/6cbc538efeee86138450c1cc1aef491bf725a8d8))
* add aria attrs to tabs ([547807b](https://github.com/CMDBrew/adminterface/commit/547807b034bddb1079380729ec5e2209ee409b5c))
Expand All @@ -23,10 +30,10 @@ All notable changes to this project will be documented in this file. See [standa
* remove user-scalable="no" from meta ([bda3b2f](https://github.com/CMDBrew/adminterface/commit/bda3b2fea20de05438f50aa3012529a0feac4792))
* bump Bootstrap to v5.1.3 to address sass parser issues when compiling. See [twbs/bootstrap#35011](https://github.com/twbs/bootstrap/issues/35011) ([46fc25d](https://github.com/CMDBrew/adminterface/commit/46fc25d4682fdf3eb662084d76b4e4360d1913fa))

### [0.2.1](https://github.com/CMDBrew/adminterface/compare/v0.2.0...v0.2.1) (2021-10-29)
## [0.2.1](https://github.com/CMDBrew/adminterface/compare/v0.2.0...v0.2.1) (2021-10-29)


#### Bug Fixes
### Bug Fixes

* fallback value for JSON.parse should be '{}' instead of {} ([727a2ba](https://github.com/CMDBrew/adminterface/commit/727a2bab65145a06428d35408861ad680c08cccd))
* missing thor class for invoke when installing action_text ([e749441](https://github.com/CMDBrew/adminterface/commit/e749441cc9929307899247d09eff3d46943c180f))
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ group :development, :test do
gem "pg"
gem "mysql2"
gem "sqlite3"
gem "webpacker", "~> 5.0"
gem "webpacker", "~> 5.4.3"

# Use Factory to create fake data
gem "faker"
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
adminterface (0.2.3)
adminterface (0.3.0)
activeadmin (~> 2.9)
httparty (>= 0.18)
image_processing (~> 1.0)
Expand Down Expand Up @@ -366,7 +366,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webpacker (5.4.0)
webpacker (5.4.3)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
Expand Down Expand Up @@ -411,7 +411,7 @@ DEPENDENCIES
vcr
webdrivers
webmock
webpacker (~> 5.0)
webpacker (~> 5.4.3)

BUNDLED WITH
2.2.15
128 changes: 19 additions & 109 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,109 +1,19 @@
# Terms of Service
This license is a legal agreement between you and CMDBrew Studio Inc. for the use of Active Admin Bootstrap (the “Software”). By downloading any Active Admin Bootstrap files, add-ons, or resources, you agree to be bound by the terms and conditions of this license. CMDBrew Studio Inc. reserves the right to alter this agreement at any time, for any reason, without notice.

## Definitions
- **"Effective Date"** means the date and time you first download, copy, install, access, deploy or otherwise make use of the Software.

- **"Entity"** means a sole proprietorship, corporation, partnership, joint venture, limited-liability company, governmental authority or agency, unincorporated organization, trust, or other legally-recognized association of two or more individuals and/or Entities.

- **"Intellectual Property Rights"** means all rights in and to U.S., Canada, and/or foreign (a) copyrights or works of authorship (whether copyrightable or not), including computer programs and rights in and to data and databases, (b) trademarks, service marks, trade dress, trade names, logos, corporate names, or domain names, or other similar designations of source or origin, together with the goodwill symbolized by any of the foregoing, (c) patents, patent disclosures, or inventions (whether patentable or not), (d) trade secrets, know-how, or other confidential information, and (e) all other intellectual property rights, in each case whether registered or unregistered, and including all registrations and applications for, and renewals or extensions of, such rights, and all similar or equivalent rights or forms of protection in any part of the world.

- **"Law"** means any statute, law, ordinance, regulation, rule, code, order, constitution, treaty, common law, judgment, decree, or other requirement of any federal, state, provincial, local, or foreign government or political subdivision thereof, or any court, arbitrator, or tribunal of competent jurisdiction.

- **"Personal Purpose"** Personal use for research, experiment, and testing for the benefit of public
knowledge, personal study, private entertainment, hobby projects, amateur
pursuits, or religious observance, without any anticipated commercial
application, doesn't count as use for a commercial purpose.

- **"Non-Personal Purpose"** Use for purposes that are outside of Personal Purpose.

- **"Repository"** means the GitHub repository located at https://github.com/CMDBrew/adminterface

- **"Software"** means source code, object code, API's, and all works incorporated into each of the foregoing.

- **"Territory"** means all countries not subject to U.S. and Canada export restrictions.

- **"Third-Party Materials"** means items not owned by us, which may include Software (such as open-source software or third-party add-ons or extensions), content, data, information, or other materials.

- **"Update"** means any change, patch, fix, upgrade, adaptation, alteration, translation, correction, revision, supplement, enhancement, improvement, or other modification of the Software that we may, in our sole discretion, release from time to time. An Update may consist, among other things, of modifications to the Software's features, functionality, or interfaces.

## Permitted Use
One single project license grants the right to use the Software on one domain and unlimited development sites. Each additional domain using the Software requires an additional purchased license. Contact contact@cmdbrew.com for other types of project licenses.

Provided that you remain at all times in compliance with the terms and conditions of this Agreement, we hereby grant to you a limited, non-exclusive, non-sub-licensable, non-transferable license to use the Software within the Territory for any purpose not prohibited by this Agreement or applicable Law (the "License"). All rights not expressly granted herein are reserved. You acknowledge that the License is adequate consideration for all your responsibilities, representations, and warranties hereunder.

**If you're developing a product for a client, you should purchase a license on behalf of the customer and transfer ownership of the license to them.**

## Restrictions
Unless you have been granted prior, written consent from CMDBrew Studio Inc., you may not:
* Reproduce, distribute, or transfer the Software, or portions thereof, to any third party.
* Sell, rent, lease, assign, or sublet the Software or portions thereof.
* Bypass, block, or disable the Software's licensing-verification mechanisms.
* Grant rights to any other person.
* Dispute our ownership of the Software or any Intellectual Property Right therein.
* Use the Software in violation of any U.S., Canada, and international law or regulation.
* Develop or provide a competing product or service.
* Use the Software for any purpose that is to our detriment or commercial disadvantage.

## Requirements
You will:

* Comply with all applicable Laws.
* Promptly notify us if you become aware of any actual or suspected infringement or misuse of the Software or any claim that the Software infringes the rights of any Person.
* Cooperate with and assist us in all reasonable ways to stop or prevent any actual or threatened infringement or misuse of the Software.
* Retain (and not alter or obscure) this Agreement and all trademarks, copyright notices, and other notices of Intellectual Property Rights in connection with the Software; and for any Non-Personal Purpose that you control or operate directly or indirectly, including by way of a contractor or intermediary.
* Notify us of the domain name utilized by the Software and the name and email of the individual(s) or organization that purchased the license.
* Pay the fee set forth in Section "Fees".

## Fees and License
Please refer to [Pricing](https://adminterface.io/pricing) for our license fees.

* **Personal:** Free forever. The Software is free of charge for Personal Purposes.

* **Commercial:** The software is being used for Non-Personal Purposes. Requires a yearly license subscription fee.

* **Payment Terms:** The yearly license subscription fee, as paid at time of purchase or license renewal, (the "Subscription") for each domain operating a Non-Personal Purpose app, is due at the time of Licence purchase until your subscription expires.
* All fees are exclusive of taxes. You are responsible for any taxes, duties, or other charges imposed by any governmental authority on amounts paid by you pursuant hereto (except for any taxes imposed on our income).
* Payment must be made in U.S. dollars by Credit Card.
* Interest will accrue on any past-due amount at the rate of 1.8% per month, compounded monthly, or the highest rate permitted by applicable Law, whichever is less. You will reimburse us immediately for all costs we incur in relation to any overdue amount, including attorney fees and collection-agency fees, whether or not a formal complaint is filed, and no notice of default is required.
* In the event that any amount becomes overdue, we may, in our sole discretion, and in addition to any other remedy available at law, in equity, or hereunder: (i) suspend or revoke your License, (ii) withhold new licenses, or (iii) terminate this Agreement. You will pay all amounts due hereunder in full, without any setoff, deduction, or withholding for any reason, except as may be permitted by applicable Law. No refunds will be granted or paid.

## Making Copies
You may make copies of the Software for back-up purposes, provided that you reproduce the Software in its original form and with all proprietary notices on the back-up copy.

## Software Modification
You may alter, modify, or extend the Software for your own use, or commission a third-party to perform modifications for you, but you may not resell, redistribute or transfer the modified or derivative version without prior written consent from CMDBrew Studio Inc.. Components from the Software may not be extracted and used in other programs without prior written consent from CMDBrew Studio Inc..

## Technical Support
CMDBrew Studio Inc. does not provide direct phone support at this time. No representations or guarantees are made regarding the response time in which e-mail support questions are answered, but we will do our best to respond quickly.

## Open-Source Components
The Software makes use of certain [Open-Source Components or other licensing](https://adminterface.io/docs/start/dependencies/) that does not restrict commercial use. Your use of Open-Source Components, including those on which the Software relies, is subject to the terms and conditions of the applicable open-source licenses. A copy of each license can be found at https://choosealicense.com/licenses/.

## Ownership
CMDBrew Studio Inc. is the sole and exclusive owner of all right, title, and interest in and to the Software, all Updates thereto, all Official Extensions based thereon, and all Intellectual Property Rights in each of the foregoing, subject only to the rights of third parties in Open-Source Components and the License granted hereunder. You acknowledge that you have no ownership interest in the Software and that, except for the License granted hereunder, nothing herein or elsewhere grants to you or any third party (by implication, waiver, estoppel or otherwise) any right, title, or interest (including any Intellectual Property Right) in or to the Software or any portion thereof.

## Contributions
If you make a Contribution to the Software, you hereby automatically, immediately, unconditionally, and irrevocably assign the entirety of such Contribution to CMDBrew Studio Inc. for no additional consideration beyond the License granted hereunder. Similarly, in the event that you acquire (by any means) or have (at any time) any right, title, or interest (including any Intellectual Property Right) in or to the Software beyond the License granted hereunder, you hereby automatically, immediately, unconditionally, and irrevocably assign the entirety of such right, title, and interest to CMDBrew Studio Inc. for no additional consideration beyond the License granted hereunder. In the event of any assignment by you to us under this Section "Contributions", you hereby irrevocably waive, to the extent permitted by applicable law, any and all claims you may now or hereafter have in any jurisdiction to all rights of paternity, integrity, disclosure, and withdrawal and any other rights (which may be known as "moral rights") with respect to the subject matter of such assignment. For further information regarding how to contribute, please visit the the Software Repository.

## Refunds
CMDBrew Studio Inc. offers limited refunds on software within 14 days of purchase. Contact contact@cmdbrew.com for assistance.

## Indemnity
You agree to indemnify and hold harmless CMDBrew Studio Inc. for any third-party claims, actions or suits, as well as any related expenses, liabilities, damages, settlements or fees arising from your use or misuse of the Software, or a violation of any terms of this license.

## Term and Termination
* **Term:** This Agreement takes effect as of the Effective Date and continues in effect until terminated as set forth below in Section "Term and Termination".

* **Termination:** This Agreement may be terminated:
* By us, at anytime, effective on written notice to you, if we, in our sole discretion, believe that you have breached this Agreement;

* By you, at any time, effective immediately, when you cease to use the Software and permanently delete all copies;

* Automatically, effective immediately and without notice, if you are a company, corporation, or other legal entity and you (A) are dissolved or liquidated or take any corporate action for such purpose; (B) become insolvent or are generally unable to pay your debts as they become due; (C) become the subject of any voluntary or involuntary bankruptcy proceeding under any domestic or foreign bankruptcy or insolvency Law; (D) make or seek to make a general assignment for the benefit of creditors; or (E) apply for, or consent to, the appointment of a trustee, receiver or custodian for a substantial part of your property.

## Disclaimer of Warranty
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF QUALITY, PERFORMANCE, NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. FURTHER, CMDBREW STUDIO INC. DOES NOT WARRANT THAT THE SOFTWARE OR ANY RELATED SERVICE WILL ALWAYS BE AVAILABLE.

## Limitations of Liability
YOU ASSUME ALL RISK ASSOCIATED WITH THE INSTALLATION AND USE OF THE SOFTWARE. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS OF THE SOFTWARE BE LIABLE FOR CLAIMS, DAMAGES OR OTHER LIABILITY ARISING FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE. LICENSE HOLDERS ARE SOLELY RESPONSIBLE FOR DETERMINING THE APPROPRIATENESS OF USE AND ASSUME ALL RISKS ASSOCIATED WITH ITS USE, INCLUDING BUT NOT LIMITED TO THE RISKS OF PROGRAM ERRORS, DAMAGE TO EQUIPMENT, LOSS OF DATA OR SOFTWARE PROGRAMS, OR UNAVAILABILITY OR INTERRUPTION OF OPERATIONS.
Copyright (c) 2021 I-Lung Lee, Richard Wang, Adminterface.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
OR OTHER DEALINGS IN THE SOFTWARE.
29 changes: 12 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
> ## ⛔️ DEPRECATED: THIS GEM IS NO LONGER BEING MAINTAINED
> Due to personal reasons, we can no longer continue to maintain this gem. As a result, we are no longer accepting or merging pull requests.
>
> To help with the transition, we've changed the license to MIT and removed the license verification for commercial uses. For alternatives, please check out other excellent solutions listed in the [ActiveAdmin Wiki](https://github.com/activeadmin/activeadmin/wiki).
>
> Thank you to all who contributed and who used Adminterface in their projects. We couldn't have made it this far without your support.
>
> Until next time.
>
> — I-Lung, Richard Wang, and the Adminterface team
# Adminterface <!-- omit in toc -->
[![CI](https://github.com/CMDBrew/adminterface/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/CMDBrew/adminterface/actions/workflows/ci.yml)
[![Maintainability](https://api.codeclimate.com/v1/badges/4dbedfdf21a2d675d2ca/maintainability)](https://codeclimate.com/github/CMDBrew/adminterface/maintainability)
Expand Down Expand Up @@ -53,20 +64,4 @@ A gem that brings Bootstrap 5, advanced customizability, and other goodies into
See [CONTRIBUTING.md](CONTRIBUTING.md).

## License
Adminterface is free for personal and non-commercial use and with a yearly subscription for commercial purposes. See our [Terms of Service in full text](LICENSE.md) for more information.

### For Commerical License
Get a license at https://adminterface.io/pricing, then create and add the `license_key` into the following file in your project:
```ruby
# config/initializers/adminterface.rb
Adminterface.setup do |config|
config.license_key = "**********************"

## Use Rails credentials:
## doc: https://edgeguides.rubyonrails.org/security.html#custom-credentials
# config.license_key = Rails.application.credentials.adminterface[:license_key]

## Or, use environment variables:
# config.license_key = ENV["ADMINTERFACE_LICENSE_KEY"]
end
```
The gem is available as open source under the terms of the [MIT License](LICENSE.md).
2 changes: 1 addition & 1 deletion adminterface.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
spec.homepage = "https://adminterface.io"
spec.summary = "Build functional and beautiful web apps faster with ActiveAdmin"
spec.description = "A gem that brings Bootstrap 5, advanced customizability, and other goodies into ActiveAdmin"
spec.license = "See LICENSE in LICENSE.md"
spec.license = "MIT"

spec.metadata["homepage_uri"] = spec.homepage
spec.metadata["source_code_uri"] = "https://github.com/cmdbrew/adminterface"
Expand Down
1 change: 1 addition & 0 deletions app/assets/stylesheets/adminterface/components/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
-webkit-box-align: end;
-webkit-box-direction: reverse;
flex-direction: row-reverse;
justify-content: flex-start;
}

li {
Expand Down
4 changes: 4 additions & 0 deletions app/assets/stylesheets/adminterface/mixins/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@
-webkit-box-shadow: #{$value};
-moz-box-shadow: #{$value};
}

@mixin lang-dir-rtl {
@at-root { html[dir="rtl"] & { @content; } }
}
Loading

0 comments on commit cc6641b

Please sign in to comment.