diff --git a/.env.development b/.env.development index d257f5f0..52dd5499 100644 --- a/.env.development +++ b/.env.development @@ -1,20 +1,31 @@ -APP_PORTFOLIO_DEVISE_KEY = "04df95945691e59c493829316335a454f1b50706a68a2c9ae1fe0084c62d98acc8d1166b984b43beec108b3f756f7c27308f0451b0031ff085e674125639ffe7" +#reCaptcha settings +APP_PORTFOLIO_reCAPTCHA_SITE_KEY=6Lf0bwAVAAAAANKF5ZbjqY-2wTO2HhOnBePLqf3z +APP_PORTFOLIO_reCAPTCHA_SECRET_KEY=6Lf0bwAVAAAAAC9ypnph7cVrCVKxoGvYniMSSll4 + +# Admin Variables +ADMIN_USERNAME=manager +ADMIN_PASSWORD=Pub1ication$ + +# Mail Variables +MAIL_SENDER='Melissa Norris ' # Database settings -APP_PORTFOLIO_DATABASE_ADAPTER=sqlite3 -APP_PORTFOLIO_DATABASE_HOST= -APP_PORTFOLIO_DATABASE_NAME=db/development.sqlite3 -APP_PORTFOLIO_DATABASE_PASSWORD= -APP_PORTFOLIO_DATABASE_POOL=5 -APP_PORTFOLIO_DATABASE_PORT= -APP_PORTFOLIO_DATABASE_TIMEOUT=5000 -APP_PORTFOLIO_DATABASE_USERNAME= +AAEC_DATABASE_ADAPTER=mysql2 +AAEC_DATABASE_HOST=libitdbtest.libraries.uc.edu +AAEC_DATABASE_NAME=lotm +AAEC_DATABASE_PASSWORD=Y9joPskKX2 +AAEC_DATABASE_POOL=5 +AAEC_DATABASE_PORT= +AAEC_DATABASE_TIMEOUT=5000 +AAEC_DATABASE_USERNAME=lotm_admin -APP_PORTFOLIO_PRODUCTION_MAILER_URL=localhost:3000 +RAILS_ENV=production +RAILS_RELATIVE_URL_ROOT=/aaec +RAILS_MASTER_KEY=4e9a1edbef0e3a45e650d99d7912c9d6 -#reCaptcha settings -APP_PORTFOLIO_reCAPTCHA_SITE_KEY="" -APP_PORTFOLIO_reCAPTCHA_SECRET_KEY="" +# Publication year +AAEC_PUBLICATION_YEAR_START="January 2020" +AAEC_PUBLICATION_YEAR_END="December 2020" -#mailer settings -MAIL_SMTP_ADDRESS='localhost' +# Expiration Date +EXPIRATION_DATE="Jul 15 2021" \ No newline at end of file diff --git a/.gitignore b/.gitignore index cd1fddcc..44e357ca 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,7 @@ /coverage # Ignore yarn.lock auto-generated file -yarn.lock +#yarn.lock # Ignore .DS_Store files generated in MAC OS .DS_Store @@ -51,3 +51,7 @@ yarn.lock #Ignore Rubymine files .idea/ + +# Ignore production .env files +.env.production +.env.production.local \ No newline at end of file diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b909f6c4..a447c5a5 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,7 +12,7 @@ // //= require rails-ujs //= require jquery3 -//= require bootstrap-sprockets +//= require bootstrap //= require gritter //= require activestorage //= require turbolinks diff --git a/bin/yarn b/bin/yarn deleted file mode 100755 index 4cac416a..00000000 --- a/bin/yarn +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env ruby -# frozen_string_literal: true - -APP_ROOT = File.expand_path('..', __dir__) -Dir.chdir(APP_ROOT) do - exec 'yarnpkg', *ARGV -rescue Errno::ENOENT - warn 'Yarn executable was not detected in the system.' - warn 'Download Yarn at https://yarnpkg.com/en/docs/install' - exit 1 -end diff --git a/config/deploy.rb b/config/deploy.rb index 13722a8c..bcb0b149 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -62,7 +62,7 @@ WARN ask :value, "Sure you want to continue deploying `#{branch}` on #{stage}? (Y)" - if fetch(:value) != 'Y' + if fetch(:value).to_s.downcase != 'y' puts "\nDeploy cancelled!" exit end diff --git a/package.json b/package.json deleted file mode 100644 index 38f18277..00000000 --- a/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "application_portfolio", - "private": true, - "dependencies": {} -}