diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 4bad284a..6e7fee04 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -14,6 +14,11 @@ // padding-top: 4.5rem; // } +#sx-menu-toggle { + background-color: transparent; + border: 1px solid transparent; +} + .setting_nav{ background-color: #2f5663; height: 53px; diff --git a/config/initializers/mysql2_adapter.rb b/config/initializers/mysql2_adapter.rb new file mode 100755 index 00000000..09424ddf --- /dev/null +++ b/config/initializers/mysql2_adapter.rb @@ -0,0 +1,45 @@ +module ActiveRecord + class Base + # Overriding ActiveRecord::Base.mysql2_connection + # method to allow passing options from database.yml + # + # Example of database.yml + # + # login: &login + # socket: /tmp/mysql.sock + # adapter: mysql2 + # host: localhost + # encoding: utf8 + # flags: 131072 + # + # @param [Hash] config hash that you define in your + # database.yml + # @return [Mysql2Adapter] new MySQL adapter object + # + def self.mysql2_connection(config) + config[:username] = 'root' if config[:username].nil? + + if Mysql2::Client.const_defined? :FOUND_ROWS + config[:flags] = config[:flags] ? config[:flags] | Mysql2::Client::FOUND_ROWS : Mysql2::Client::FOUND_ROWS + end + + client = Mysql2::Client.new(config.symbolize_keys) + options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0] + ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config) + end + end + + # This method is for running stored procedures. + # + # @return [Hash] + # + def self.select_sp(sql, name = nil) + connection = ActiveRecord::Base.connection + begin + connection.select_all(sql, name) + rescue NoMethodError + ensure + connection.reconnect! unless connection.active? + end + end +end diff --git a/config/initializers/secrets.rb b/config/initializers/secrets.rb new file mode 100755 index 00000000..6ad1f1eb --- /dev/null +++ b/config/initializers/secrets.rb @@ -0,0 +1,6 @@ +# config = YAML.load_file(Rails.root.join("config/smartsales.yml")) +# config.fetch(Rails.env, {}).each do |key, value| +# ENV[key.upcase] = value.to_s +# end + +SECRETS_CONFIG = YAML.load_file("#{Rails.root}/config/secrets.yml")[Rails.env] diff --git a/config/initializers/sx.rb b/config/initializers/sx.rb new file mode 100644 index 00000000..aa52f14c --- /dev/null +++ b/config/initializers/sx.rb @@ -0,0 +1,4 @@ +config = YAML.load_file(Rails.root.join("config/sx.yml")) +config.fetch(Rails.env, {}).each do |key, value| + ENV[key.upcase] = value.to_s +end \ No newline at end of file diff --git a/config/secrets.yml b/config/secrets.yml index ce7eb8ba..097a13b9 100644 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -12,6 +12,7 @@ development: secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 + provision_key: siPExnkwlHvAXkyQERzAWhNDwpuvnbqsTXoEHaxc test: secret_key_base: 5c92143fd4a844fdaf8b22aba0cda22ef1fc68f1b26dd3d40656866893718ae5e58625b4c3a5dc86b04c8be0a505ec0ebc0be3bf52249a3d1e0c1334ee591cf0 @@ -20,4 +21,5 @@ test: # instead read values from the environment. production: secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22 + provision_key: siPExnkwlHvAXkyQERzAWhNDwpuvnbqsTXoEHaxc diff --git a/config/sx.yml b/config/sx.yml new file mode 100644 index 00000000..6bcab70c --- /dev/null +++ b/config/sx.yml @@ -0,0 +1,13 @@ +development: + server_mode: cloud #local + sx_provision_url: http://192.168.1.75:3002/api + + +test: + sx_provision_url: secure.smartsales.asia/api + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + server_mode: cloud + sx_provision_url: secure.smartsales.asia/api