config jquery loading and redo yarn install

DevNeoLee · Dec 3, 2020 · 38df64d · 38df64d
1 parent 9bd9163
commit 38df64d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/app/assets/images/share_desk.gif b/app/assets/images/share_desk.gif
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
@@ -5,8 +5,8 @@ require("@rails/activestorage").start()
 require("channels")
 require('jquery')
 require('popper.js')
-// require('bootstrap')
-import "bootstrap"
+require('bootstrap')
+// import "bootstrap"
 global.toastr = require("toastr")
 require("jquery-ui")
 
@@ -43,7 +43,7 @@ toastr.options = {
   "onclick": null,
   "showDuration": "10000",
   "hideDuration": "1000",
-  "timeOut": "1000",
+  "timeOut": "3000",
   "extendedTimeOut": "1000",
   "showEasing": "swing",
   "hideEasing": "linear",

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -33,7 +33,7 @@
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
-  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+
   config.action_mailer.perform_caching = false
 
   # Print deprecation notices to the Rails logger.

diff --git a/config/routes.rb b/config/routes.rb
@@ -9,7 +9,7 @@
 
   get 'pages/home', to: 'pages#home'
 
-  resources :users, only: [:show] #프로파일 유저 각각의
+  resources :users, only: [:show] 
 
   resources :rooms 
   resources :rooms do 

diff --git a/config/webpacker.yml b/config/webpacker.yml
@@ -14,7 +14,7 @@ default: &default
   resolved_paths: []
 
   # Reload manifest.json on all requests so we reload latest compiled packs
-  cache_manifest: true
+  cache_manifest: false
 
   # Extract and emit a css file
   extract_css: false

diff --git a/package.json b/package.json
@@ -19,5 +19,4 @@
   "devDependencies": {
     "webpack-dev-server": "^3.11.0"
   }
-
 }