some updates

This commit is contained in:
Benjamin
2021-04-21 17:22:56 -05:00
parent 0c5457d680
commit 714ce8f8c6
5 changed files with 24 additions and 21 deletions
+16 -14
View File
@@ -1,3 +1,5 @@
# frozen_string_literal: true
source 'https://rubygems.org'
gem 'rails', '~> 6.1.3.1'
@@ -14,17 +16,18 @@ gem 'slim-rails'
#gem 'jsonapi-serializers', path: '/home/benjamin/development/rails/components/jsonapi-serializers'
gem 'jsonapi-serializers', github: 'bterkuile/jsonapi-serializers'
group :assets do
gem 'jquery-rails'
gem 'jquery-ui-rails' #, '~> 5.0.5' # https://github.com/joliss/jquery-ui-rails/issues/108
gem 'sass-rails' #, '~> 5.0.0'
gem 'bourbon' #, '4.0.2' #animation keyframes
gem 'coffee-rails', '>= 5.0.0'
gem 'sass-rails' #, '~> 5.0.0'
#gem 'twitter-bootstrap-rails'
# Only for mobile assets precompile, not used in this project
#gem 'bootstrap-sass', '~>2.3'
gem 'bourbon' #, '4.0.2' #animation keyframes
#gem 'compass-rails'
gem 'font-awesome-rails'
gem 'foundation-rails', '~> 5.5' #, github: 'bterkuile/foundation-rails'
gem 'jquery-rails'
gem 'jquery-ui-rails' #, '~> 5.0.5' # https://github.com/joliss/jquery-ui-rails/issues/108
gem 'js-routes'
gem "font-awesome-rails"
#gem 'capistrano-local-precompile', require: false
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
@@ -42,7 +45,6 @@ group :assets do
#gem 'ember-emblem-template' #, github: 'bterkuile/ember-emblem-template'
##gem 'ember-emblem-template', path: '/home/benjamin/development/rails/components/ember-emblem-template'
gem 'foundation-rails', '~> 5.5' #, github: 'bterkuile/foundation-rails'
gem 'ace-rails-ap'
gem 'pickadate-rails'
#gem 'mustache' #, require: 'mustache/railtie'
@@ -63,8 +65,8 @@ gem 'simply_stored', github: 'bterkuile/simply_stored', branch: :master
gem 'devise' #, github: 'plataformatec/devise', branch: 'lm-rails-4-2' #, '3.1.0' #, '2.0.4'
gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored'
gem 'devise-i18n'
gem "omniauth-facebook"
gem "omniauth-instagram"
gem 'omniauth-facebook'
gem 'omniauth-instagram'
#gem 'simple_form'
gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator'
#gem 'cmtool', github: 'bterkuile/cmtool'
@@ -121,17 +123,17 @@ group :test do
#gem 'capybara-webkit' #, '~>0.14.2' # version 1.1.0 does not yet compile in mavericks
#gem 'selenium-webdriver', '~> 2.45.0.dev3'
#gem 'selenium-webdriver'
gem 'timecop'
gem 'poltergeist'
#gem 'capybara-webkit'
gem 'capybara-screenshot'
gem 'turnip'
gem 'rspec-its'
gem 'launchy'
gem 'fuubar'
gem 'launchy'
gem 'poltergeist'
gem 'rspec-its'
gem 'simplecov', require: false
gem 'timecop'
gem 'turnip'
gem 'webmock'
#gem 'rb-fsevent', require: false #if RUBY_PLATFORM =~ /darwin/i
gem 'simplecov', require: false
end
#source 'https://rails-assets.org' do
+1 -1
View File
@@ -9,7 +9,7 @@ html lang="en"
= javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
= stylesheet_link_tag "theme1/application", :media => "all"
link href="/favicon.ico" rel="shortcut icon"
link href='http://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'
link href='https://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'
body
.header-nav-banner
@@ -9,7 +9,7 @@ html lang=I18n.locale
= javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
= stylesheet_link_tag "theme1/application", :media => "all"
link href="/favicon.ico" rel="shortcut icon"
link href='http://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'
link href='https://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'
body
.header-nav-banner
+1 -1
View File
@@ -9,7 +9,7 @@ html lang=I18n.locale
= javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
= stylesheet_link_tag "theme1/application", :media => "all"
link href="/favicon.ico" rel="shortcut icon"
link href='http://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'
link href='https://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'
body
.header-nav-banner
+5 -4
View File
@@ -1,3 +1,5 @@
# frozen_string_literal: true
Qwaiter::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
@@ -7,13 +9,12 @@ Qwaiter::Application.configure do
config.cache_classes = false
config.middleware.insert_before 0, Rack::Cors do
allow do
origins 'localhost', 'supplier.mozo.local', 'user.mozo.local', 'events.mozo.local'
origins 'https://localhost:4202', 'https://localhost:4201', 'http://localhost:9296', 'supplier.mozo.local', 'user.mozo.local', 'events.mozo.local'
#resource '/user/*', :headers => '*', :methods => '*' #[:get, :post, :options]
resource '*', headers: :any, methods: [:get, :post, :put, :patch, :delete, :options]
resource '*', headers: :any, methods: %i[get post put patch delete options]
end
end
# Do not eager load code on boot.
config.eager_load = false
@@ -24,7 +25,7 @@ Qwaiter::Application.configure do
#config.ember.variant = :development
config.action_controller.asset_host = "https://localhost:3002"
config.action_controller.asset_host = 'https://localhost:3002'
config.force_ssl = true
# config.web_console.automount = true