feat: new release merging

ricardo-benicio · Jul 10, 2023 · f27b169 · f27b169
2 parents 4aee334 + d129582
commit f27b169
Show file tree

Hide file tree

Showing 13 changed files with 115 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,4 +33,4 @@
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key
-/.idea
+.idea
diff --git a/.idea/crypto_wallet.iml b/.idea/crypto_wallet.iml
diff --git a/Gemfile b/Gemfile
@@ -3,6 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gem 'rails-i18n'
 gem 'tty-spinner'
+gem 'bootstrap'
 
 ruby "3.2.2"
 
@@ -46,7 +47,7 @@ gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
 gem "bootsnap", require: false
 
 # Use Sass to process CSS
-# gem "sassc-rails"
+gem "sassc-rails"
 
 # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
 # gem "image_processing", "~> 1.2"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -68,9 +68,15 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
+    autoprefixer-rails (10.4.13.0)
+      execjs (~> 2)
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
+    bootstrap (5.2.3)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 2.11.6, < 3)
+      sassc-rails (>= 2.0.0)
     builder (3.2.4)
     capybara (3.39.1)
       addressable
@@ -88,6 +94,8 @@ GEM
       irb (>= 1.5.0)
       reline (>= 0.3.1)
     erubi (1.12.0)
+    execjs (2.8.1)
+    ffi (1.15.5)
     globalid (1.1.0)
       activesupport (>= 5.0)
     i18n (1.14.1)
@@ -127,6 +135,7 @@ GEM
     nio4r (2.5.9)
     nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
+    popper_js (2.11.7)
     public_suffix (5.0.1)
     puma (5.6.5)
       nio4r (~> 2.0)
@@ -170,6 +179,14 @@ GEM
       io-console (~> 0.5)
     rexml (3.2.5)
     rubyzip (2.3.2)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     selenium-webdriver (4.9.1)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -185,6 +202,7 @@ GEM
     stimulus-rails (1.2.1)
       railties (>= 6.0.0)
     thor (1.2.2)
+    tilt (2.2.0)
     timeout (0.3.2)
     tty-cursor (0.7.1)
     tty-spinner (0.9.3)
@@ -217,13 +235,15 @@ PLATFORMS
 
 DEPENDENCIES
   bootsnap
+  bootstrap
   capybara
   debug
   importmap-rails
   jbuilder
   puma (~> 5.0)
   rails (~> 7.0.5)
   rails-i18n
+  sassc-rails
   selenium-webdriver
   sprockets-rails
   sqlite3 (~> 1.4)

diff --git a/app/assets/stylesheets/application.css → app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.css → app/assets/stylesheets/application.scss
@@ -13,3 +13,5 @@
  *= require_tree .
  *= require_self
  */
+
+@import "bootstrap";
diff --git a/app/assets/stylesheets/scaffolds.scss.erb b/app/assets/stylesheets/scaffolds.scss.erb
@@ -0,0 +1,4 @@
+body {
+    //background-color: <% Rails.env.development? ? 'yellow':'red' %>;
+    //background-image: asset_url('rails.png');
+}
diff --git a/app/javascript/application.js b/app/javascript/application.js
diff --git a/app/javascript/application.js.erb b/app/javascript/application.js.erb
@@ -0,0 +1,10 @@
+// Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
+import "@hotwired/turbo-rails"
+import "controllers"
+//import "jquery/dist/jquery"
+//import "notify-js-legacy/notify"
+//import "bootstrap/dist/js/bootstrap"
+//import "/jquery/dist/jquery"
+
+<% msg =Time.now.hour < 12 ? 'Bom dia!' : 'Olá!!!' %>
+//alert("<%= msg %>");
diff --git a/config/importmap.rb b/config/importmap.rb
@@ -5,3 +5,5 @@
 pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
 pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
 pin_all_from "app/javascript/controllers", under: "controllers"
+pin "popper", to: "core/dist/cjs/popper.js", preload:true
+pin "bootstrap", to: "bootstrap/dist/js/bootstrap", preload:true
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -7,17 +7,20 @@
 # Rails.application.config.assets.paths << Emoji.images_path
 
 # Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in the app/assets
+# application.js.erb, application.scss, and all non-JS/CSS in the app/assets
 # folder are already added.
 # Rails.application.config.assets.precompile += %w( admin.js admin.css )
 #
-#Rails.application.config.assets.precompile += %w( cable.js
-#                                                 coins.js
-#                                                 mining_types.js
-#                                                 welcome.js
-#                                               )
-#Rails.application.config.assets.precompile += %w( coins.css
-#                                                 mining_types.css
-#                                                 scaffolds.css
-#                                                 welcome.css
-#                                               )
+Rails.application.config.assets.precompile += %w( bootstrap.min.js
+                                                  popper.js
+                                                  jquery.js
+                                                  cable.js
+                                                  coins.js
+                                                  mining_types.js
+                                                  welcome.js
+                                                )
+Rails.application.config.assets.precompile += %w( coins.css
+                                                  mining_types.css
+                                                  scaffolds.css
+                                                  welcome.css
+                                                )
diff --git a/lib/assets/images/rails.png b/lib/assets/images/rails.png
diff --git a/package.json b/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "crypto_wallet",
+  "version": "1.0.0",
+  "main": "index.js",
+  "repository": "https://github.com/ricardofelipe7/crypto_wallet.git",
+  "author": "ricardofelipe7 <[email protected]>",
+  "license": "MIT",
+  "dependencies": {
+    "@hotwired/stimulus": "^3.2.1",
+    "bootstrap": "^5.3.0",
+    "jquery": "^3.7.0",
+    "notify-js-legacy": "^0.4.1",
+    "popper.js": "^1.16.1"
+  }
+}
diff --git a/yarn.lock b/yarn.lock
@@ -0,0 +1,28 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@hotwired/stimulus@^3.2.1":
+  version "3.2.1"
+  resolved "https://registry.npmjs.org/@hotwired/stimulus/-/stimulus-3.2.1.tgz"
+  integrity sha512-HGlzDcf9vv/EQrMJ5ZG6VWNs8Z/xMN+1o2OhV1gKiSG6CqZt5MCBB1gRg5ILiN3U0jEAxuDTNPRfBcnZBDmupQ==
+
+bootstrap@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.0.tgz"
+  integrity sha512-UnBV3E3v4STVNQdms6jSGO2CvOkjUMdDAVR2V5N4uCMdaIkaQjbcEAMqRimDHIs4uqBYzDAKCQwCB+97tJgHQw==
+
+jquery@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz"
+  integrity sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==
+
+notify-js-legacy@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.npmjs.org/notify-js-legacy/-/notify-js-legacy-0.4.1.tgz"
+  integrity sha512-v9tUdioFeizt2Y+wD9Vg4MWN8zbX5BTLfjHMO9UBKKLODZSsfnlV+MWONWVldB6sXqvg3AbaYB407WxnmYZk/g==
+
+popper.js@^1.16.1:
+  version "1.16.1"
+  resolved "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz"
+  integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==