Merge branch 'master' into 1-dh-google-recaptcha-back

pl1tz · Dec 27, 2024 · 45e7c10 · 45e7c10
2 parents b29dcac + 511547f
commit 45e7c10
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/config/application.rb b/config/application.rb
@@ -28,7 +28,7 @@ class Application < Rails::Application
 
     config.middleware.insert_before 0, Rack::Cors do
       allow do
-        origins 'http://localhost:8080' # Укажите ваш фронтенд URL
+        origins '*' # Укажите ваш фронтенд URL
         resource '*',
           headers: :any,
           methods: [:get, :post, :put, :patch, :delete, :options, :head]

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -80,11 +80,11 @@
   # config.generators.apply_rubocop_autocorrect_after_generate!
 
   # домены оставляем для будущего использования
-  config.hosts << "usecar.ru"
-  config.hosts << "www.usecar.ru"
-  # config.hosts << "usecarmax.ru"
-  # config.hosts << "www.usecarmax.ru"
-  # config.hosts << "youautoplus.ru"
-  # config.hosts << "www.youautoplus.ru"
+  # config.hosts << "usecar.ru"
+  # config.hosts << "www.usecar.ru"
+  config.hosts << "usecarmax.ru"
+  config.hosts << "www.usecarmax.ru"
+  config.hosts << "youautoplus.ru"
+  config.hosts << "www.youautoplus.ru"
 
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -101,10 +101,10 @@
   # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
 
   # домены оставляем для будущего использования
-  config.hosts << "usecar.ru"
-  config.hosts << "www.usecar.ru"
-    # config.hosts << "usecarmax.ru"
-    # config.hosts << "www.usecarmax.ru"
+  # config.hosts << "usecar.ru"
+  # config.hosts << "www.usecar.ru"
+  config.hosts << "usecarmax.ru"
+  config.hosts << "www.usecarmax.ru"
   # config.hosts << "youautoplus.ru"
   # config.hosts << "www.youautoplus.ru"
 end
diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
@@ -8,7 +8,7 @@
 
 Rails.application.config.middleware.insert_before 0, Rack::Cors do
     allow do
-      origins 'http://localhost:8080'# Укажите ваш фронтенд URL
+      origins '*'# Укажите ваш фронтенд URL
       resource '*',
         headers: :any,
         methods: [:get, :post, :put, :patch, :delete, :options, :head]

diff --git a/public/404.html b/public/404.html
@@ -27,18 +27,18 @@
         a {
             text-decoration: none;
             color: #fff;
-            background-color: #ebd513;
+            background-color: #0f8921;
             /* background-color: #F44336;
-            background-color: #0f8921; background-color: #0c51d1;*/
+            background-color: #ebd513; background-color: #0c51d1;*/
             padding: 10px 20px;
             border-radius: 5px;
             transition: background-color 0.3s;
         }
 
         a:hover {
-            background-color: #ebd513;
+            background-color: #0f8921;
             /* background-color: #F44336;
-            background-color: #0f8921; background-color: #0c51d1;*/
+            background-color: #ebd513; background-color: #0c51d1;*/
         }
 
     </style>

diff --git a/public/index.html b/public/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>YouAuto</title><script>window._ab_id_ = 150566;</script><script defer="defer" src="https://cdn.botfaqtor.ru/one.js"></script><link rel="icon" href="/assets/favicon.ico"><script defer="defer" src="/711.59471271359cf2fa118f.js"></script><script defer="defer" src="/main.f15ce2eeee82f7c80218.js"></script><link href="/711.cc3e9d8103445cad502f.css" rel="stylesheet"><link href="/main.e9635ca020501d76280c.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>YouAuto</title><script>window._ab_id_ = 150566;</script><script defer="defer" src="https://cdn.botfaqtor.ru/one.js"></script><link rel="icon" href="/assets/favicon.ico"><script defer="defer" src="/469.73da8cced0fe8503deae.js"></script><script defer="defer" src="/main.b5fbf4e3616badfc962d.js"></script><link href="/469.cc3e9d8103445cad502f.css" rel="stylesheet"><link href="/main.43c982731b1022ae2eb7.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>YouAuto</title><script>window._ab_id_ = 150566;</script><script defer="defer" src="https://cdn.botfaqtor.ru/one.js"></script><link rel="icon" href="/assets/favicon.ico"><script defer="defer" src="/711.59471271359cf2fa118f.js"></script><script defer="defer" src="/main.f15ce2eeee82f7c80218.js"></script><link href="/711.cc3e9d8103445cad502f.css" rel="stylesheet"><link href="/main.e9635ca020501d76280c.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>YouAuto</title><script>window._ab_id_ = 150566;</script><script defer="defer" src="https://cdn.botfaqtor.ru/one.js"></script><link rel="icon" href="/assets/favicon.ico"><script defer="defer" src="/469.73da8cced0fe8503deae.js"></script><script defer="defer" src="/main.b5fbf4e3616badfc962d.js"></script><link href="/469.cc3e9d8103445cad502f.css" rel="stylesheet"><link href="/main.43c982731b1022ae2eb7.css" rel="stylesheet"></head><body><div id="root"></div></body></html>