diff --git a/.gitignore b/.gitignore
index aa3f8867..51f1d350 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,15 +14,15 @@
# Ignore static assets.
/public/system/**
/public/assets/**
+/public/gl/**
# Ignore production paths.
/db/production
# Ignore all logfiles and tempfiles.
/log/*
-/tmp/*
+/tmp
!/log/.keep
-!/tmp/.keep
# Ignore Byebug command history file.
.byebug_history
diff --git a/app/assets/stylesheets/_tabler-custom.scss b/app/assets/stylesheets/_tabler-custom.scss
index 95668849..8a28ca2b 100644
--- a/app/assets/stylesheets/_tabler-custom.scss
+++ b/app/assets/stylesheets/_tabler-custom.scss
@@ -1,4 +1,4 @@
-//@import "tabler/functions";
+@import "tabler/functions";
@import "tabler/core";
@import "tabler/type";
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.scss
similarity index 100%
rename from app/assets/stylesheets/application.css.scss
rename to app/assets/stylesheets/application.scss
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index cced7164..dc4ff6a3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -47,7 +47,8 @@ class ApplicationController < ActionController::Base
user_is_moderator: false,
meeting_logout_url: request.base_url + logout_room_path(@room),
meeting_recorded: true,
- moderator_message: "To invite someone to the meeting, send them this link:\n\n#{request.base_url + room_path(@room)}"
+ moderator_message: "To invite someone to the meeting, send them this link:\n\n
+ #{request.base_url + Rails.configuration.relative_url_root + room_path(@room)}"
}
end
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 09c9f44e..039b657b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -10,7 +10,7 @@ module ApplicationHelper
# Generates the login URL for a specific provider.
def omniauth_login_url(provider)
- "/auth/#{provider}"
+ "#{Rails.configuration.relative_url_root}/auth/#{provider}"
end
# Determine if Greenlight is configured to allow user signups.
diff --git a/app/views/shared/modals/_login_modal.html.erb b/app/views/shared/modals/_login_modal.html.erb
index 7f599ed3..f6f2307c 100644
--- a/app/views/shared/modals/_login_modal.html.erb
+++ b/app/views/shared/modals/_login_modal.html.erb
@@ -21,7 +21,7 @@
- <%= f.text_field :email, class: "form-control", placeholder: "Email" %>
+ <%= f.text_field :email, class: "form-control", placeholder: "Email", value: "" %>
@@ -30,7 +30,7 @@
- <%= f.password_field :password, class: "form-control", placeholder: "Password" %>
+ <%= f.password_field :password, class: "form-control", placeholder: "Password", value: "" %>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4b54f885..1e6aa690 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -16,14 +16,14 @@ Rails.application.configure do
# Disable serving static files from the `/public` folder by default since
# Apache or NGINX already handles this.
- config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+ config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].blank?
# Compress JavaScripts and CSS.
config.assets.js_compressor = Uglifier.new(harmony: true)
# config.assets.css_compressor = :sass
# Do not fallback to assets pipeline if a precompiled asset is missed.
- config.assets.compile = true
+ config.assets.compile = false
# `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
@@ -88,6 +88,6 @@ Rails.application.configure do
if ENV['RELATIVE_URL_ROOT'].present?
config.relative_url_root = ENV['RELATIVE_URL_ROOT']
else
- config.relative_url_root = ""
+ config.relative_url_root = "/"
end
end
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 5a5bc260..54a967b3 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -8,4 +8,4 @@ Rails.application.config.assets.version = '1.0'
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-Rails.application.config.assets.precompile += %w(application.css)
+# Rails.application.config.assets.precompile += %w()