diff --git a/app/javascript/active_admin.js b/app/javascript/active_admin.js new file mode 100644 index 0000000..06b7684 --- /dev/null +++ b/app/javascript/active_admin.js @@ -0,0 +1,6 @@ + +import './add_jquery' +import "jquery/dist/jquery" +import "jquery-ui/dist/jquery-ui" +import "jquery-ujs" +import "@activeadmin/activeadmin" \ No newline at end of file diff --git a/app/javascript/add_jquery.js b/app/javascript/add_jquery.js new file mode 100644 index 0000000..dd22307 --- /dev/null +++ b/app/javascript/add_jquery.js @@ -0,0 +1,4 @@ +import jquery from 'jquery' +import $ from 'jquery' +window.jQuery = jquery +window.$ = $ \ No newline at end of file diff --git a/app/javascript/application.js b/app/javascript/application.js index 8a40626..1aad597 100644 --- a/app/javascript/application.js +++ b/app/javascript/application.js @@ -6,3 +6,4 @@ import "@fontsource/raleway/400.css"; import "@fontsource/raleway/600.css"; import "./controllers" +import "./active_admin" diff --git a/package.json b/package.json index 7604aec..3f93649 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,8 @@ "@hotwired/stimulus": "^3.2.2", "@hotwired/turbo-rails": "^8.0.12", "autoprefixer": "^10.4.20", + "jquery": "^3.7.1", + "jquery-ui": "^1.14.1", "postcss": "^8.5.1", "sass": "^1.83.4", "tailwindcss": "^3.4.17" diff --git a/yarn.lock b/yarn.lock index 796ce5a..91e1d6e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -729,12 +729,19 @@ jquery-ui@^1.13.3: dependencies: jquery ">=1.12.0 <5.0.0" +jquery-ui@^1.14.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.14.1.tgz#ba342ea3ffff662b787595391f607d923313e040" + integrity sha512-DhzsYH8VeIvOaxwi+B/2BCsFFT5EGjShdzOcm5DssWjtcpGWIMsn66rJciDA6jBruzNiLf1q0KvwMoX1uGNvnQ== + dependencies: + jquery ">=1.12.0 <5.0.0" + jquery-ujs@^1.2.2: version "1.2.3" resolved "https://registry.npmjs.org/jquery-ujs/-/jquery-ujs-1.2.3.tgz" integrity sha512-59wvfx5vcCTHMeQT1/OwFiAj+UffLIwjRIoXdpO7Z7BCFGepzq9T9oLVeoItjTqjoXfUrHJvV7QU6pUR+UzOoA== -"jquery@>=1.12.0 <5.0.0", jquery@^3.4.1: +"jquery@>=1.12.0 <5.0.0", jquery@^3.4.1, jquery@^3.7.1: version "3.7.1" resolved "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz" integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==