From 8d903bc9c01efdbabeb85fe4e148a45c49548784 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 13 Feb 2023 22:31:21 -0800 Subject: [PATCH] try to upgrade rails_admin but we need to update sprockets first for it to actually work --- Gemfile | 2 +- Gemfile.lock | 4 +- app/javascript/packs/rails_admin.js | 2 + app/javascript/stylesheets/rails_admin.scss | 1 + config/initializers/rails_admin.rb | 1 + package.json | 4 +- yarn.lock | 82 +++++++++++++++++++++ 7 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 app/javascript/packs/rails_admin.js create mode 100644 app/javascript/stylesheets/rails_admin.scss diff --git a/Gemfile b/Gemfile index 1aab5b5c..4496c398 100644 --- a/Gemfile +++ b/Gemfile @@ -95,7 +95,7 @@ gem 'redis' gem 'csv' # Admin -gem 'rails_admin', '~> 3.1' +gem 'rails_admin' # Tech debt & hacks gem 'binding_of_caller' # see has_changelog.rb diff --git a/Gemfile.lock b/Gemfile.lock index 408b7279..9d2767b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1715,7 +1715,7 @@ DEPENDENCIES rails rails-jquery-autocomplete rails-ujs - rails_admin (~> 3.1) + rails_admin react-rails redcarpet redis @@ -1742,4 +1742,4 @@ RUBY VERSION ruby 2.7.2p137 BUNDLED WITH - 2.3.5 + 2.4.6 diff --git a/app/javascript/packs/rails_admin.js b/app/javascript/packs/rails_admin.js new file mode 100644 index 00000000..63c31b59 --- /dev/null +++ b/app/javascript/packs/rails_admin.js @@ -0,0 +1,2 @@ +import "rails_admin/src/rails_admin/base"; +import "../stylesheets/rails_admin.scss"; diff --git a/app/javascript/stylesheets/rails_admin.scss b/app/javascript/stylesheets/rails_admin.scss new file mode 100644 index 00000000..8ca6f865 --- /dev/null +++ b/app/javascript/stylesheets/rails_admin.scss @@ -0,0 +1 @@ +@import "rails_admin/src/rails_admin/styles/base"; diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb index 859cc16e..2911418d 100644 --- a/config/initializers/rails_admin.rb +++ b/config/initializers/rails_admin.rb @@ -1,4 +1,5 @@ RailsAdmin.config do |config| + config.asset_source = :webpacker ### Popular gems integration diff --git a/package.json b/package.json index 16d147c5..9160f6bf 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "babel-plugin-transform-react-remove-prop-types": "^0.4.24", "pluralize": "^8.0.0", "prop-types": "^15.7.2", + "rails_admin": "3.1.1", "react": "^16.14.0", "react-dom": "^16.14.0", "react-simple-format": "^0.3.0", @@ -24,6 +25,7 @@ "fsevents": "^2.3.2" }, "resolutions": { - "chokidar": "^3.4.0" + "chokidar": "^3.4.0", + "rails_admin/@fortawesome/fontawesome-free": "^5.15.0" } } diff --git a/yarn.lock b/yarn.lock index c567aacf..240a12e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -900,6 +900,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.16.7": + version "7.20.13" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.13.tgz#7055ab8a7cff2b8f6058bf6ae45ff84ad2aded4b" + integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA== + dependencies: + regenerator-runtime "^0.13.11" + "@babel/template@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" @@ -942,6 +949,24 @@ resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== +"@fortawesome/fontawesome-free@>=5.15.0 <7.0.0", "@fortawesome/fontawesome-free@^5.15.0": + version "5.15.4" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5" + integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg== + +"@hotwired/turbo-rails@^7.1.0": + version "7.2.5" + resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.2.5.tgz#74fc3395a29a76df2bb8835aa88c86885cffde4c" + integrity sha512-F8ztmARxd/XBdevRa//HoJGZ7u+Unb0J7cQUeUP+pBvt9Ta2TJJ7a2TORAOhjC8Zgxx+LKwm/1UUHqN3ojjiGw== + dependencies: + "@hotwired/turbo" "^7.2.5" + "@rails/actioncable" "^7.0" + +"@hotwired/turbo@^7.2.5": + version "7.2.5" + resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.2.5.tgz#2d9d6bde8a9549c3aea8970445ade16ffd56719a" + integrity sha512-o5PByC/mWkmTe4pWnKrixhPECJUxIT/NHtxKqjq7n9Fj6JlNza1pgxdTCJVIq+PI0j95U+7mA3N4n4A/QYZtZQ== + "@material-ui/core@^4.9.1": version "4.11.4" resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.4.tgz#4fb9fe5dec5dcf780b687e3a40cff78b2b9640a4" @@ -1032,6 +1057,21 @@ mkdirp "^1.0.4" rimraf "^3.0.2" +"@popperjs/core@^2.11.0": + version "2.11.6" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45" + integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== + +"@rails/actioncable@^7.0": + version "7.0.4" + resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.4.tgz#70a3ca56809f7aaabb80af2f9c01ae51e1a8ed41" + integrity sha512-tz4oM+Zn9CYsvtyicsa/AwzKZKL+ITHWkhiu7x+xF77clh2b4Rm+s6xnOgY/sGDWoFWZmtKsE95hxBPkgQQNnQ== + +"@rails/ujs@^6.1.4-1": + version "6.1.7" + resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.7.tgz#b09dc5b2105dd267e8374c47e4490240451dc7f6" + integrity sha512-0e7WQ4LE/+LEfW2zfAw9ppsB6A8RmxbdAUPAF++UT80epY+7emuQDkKXmaK0a9lp6An50RvzezI0cIQjp1A58w== + "@rails/webpacker@^5.2.1": version "5.4.0" resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-5.4.0.tgz#2c64a9ea7e85d2a33e50e86319fe6751df0c47e8" @@ -1628,6 +1668,11 @@ boolbase@^1.0.0, boolbase@~1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= +bootstrap@^5.1.3: + version "5.2.3" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz#54739f4414de121b9785c5da3c87b37ff008322b" + integrity sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ== + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -3074,6 +3119,11 @@ findup-sync@^3.0.0: micromatch "^3.0.4" resolve-dir "^1.0.1" +flatpickr@^4.6.9: + version "4.6.13" + resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz#8a029548187fd6e0d670908471e43abe9ad18d94" + integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw== + flatted@^3.1.1: version "3.2.0" resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.0.tgz#da07fb8808050aba6fdeac2294542e5043583f05" @@ -3915,6 +3965,18 @@ jest-worker@^26.5.0: merge-stream "^2.0.0" supports-color "^7.0.0" +jquery-ui@^1.12.1: + version "1.13.2" + resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz#de03580ae6604773602f8d786ad1abfb75232034" + integrity sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q== + dependencies: + jquery ">=1.8.0 <4.0.0" + +"jquery@>=1.8.0 <4.0.0", jquery@^3.6.0: + version "3.6.3" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.3.tgz#23ed2ffed8a19e048814f13391a19afcdba160e6" + integrity sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg== + "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -5750,6 +5812,21 @@ querystringify@^2.1.1: resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== +rails_admin@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/rails_admin/-/rails_admin-3.1.1.tgz#f0ddbdfb44c5cab01e360337a86e1ac5b5c94a6a" + integrity sha512-d0OAHKF0tM2gfTC9uBKIq0nZJb31mtde7oFmMGbWl/BOPiehffglGQKUtoSUxHBJlBKPiK8k8yiAbfzrf3kaFg== + dependencies: + "@babel/runtime" "^7.16.7" + "@fortawesome/fontawesome-free" ">=5.15.0 <7.0.0" + "@hotwired/turbo-rails" "^7.1.0" + "@popperjs/core" "^2.11.0" + "@rails/ujs" "^6.1.4-1" + bootstrap "^5.1.3" + flatpickr "^4.6.9" + jquery "^3.6.0" + jquery-ui "^1.12.1" + randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -5881,6 +5958,11 @@ regenerate@^1.4.0: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== +regenerator-runtime@^0.13.11: + version "0.13.11" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" + integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== + regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7: version "0.13.7" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"