diff --git a/app/assets/images/pizzajerk.jpeg b/app/assets/images/pizzajerk.jpg similarity index 100% rename from app/assets/images/pizzajerk.jpeg rename to app/assets/images/pizzajerk.jpg diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb index 3e52594..b15d644 100644 --- a/app/views/pages/home.html.erb +++ b/app/views/pages/home.html.erb @@ -98,7 +98,7 @@
<%= link_to "http://www.pizzajerkpdx.com/", target: "_blank" do %> - <%= image_tag "pizzajerk.jpeg", alt: "Pizza Jerk", width: "450px", height:"450px;", margin: "20px"%> + <%= image_tag "pizzajerk.jpg", alt: "Pizza Jerk", width: "450px", height:"450px;", margin: "20px"%> <% end %>
diff --git a/config/database.yml b/config/database.yml index ed6ecd4..0950763 100644 --- a/config/database.yml +++ b/config/database.yml @@ -75,11 +75,5 @@ test: # # You can use this database configuration with: # -# production: -# url: <%= ENV['DATABASE_URL'] %> -# production: - <<: *default - database: codeforpdx_production - username: codeforpdx - password: <%= ENV['CODEFORPDX_DATABASE_PASSWORD'] %> + url: <%= ENV['DATABASE_URL'] %> \ No newline at end of file diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index cd80e7e..0d76e81 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -1,18 +1,5 @@ CarrierWave.configure do |config| - config.storage = :aws - config.aws_bucket = ENV.fetch('S3_BUCKET_NAME') - config.aws_acl = 'public-read' - config.aws_authenticated_url_expiration = 60 * 60 * 24 * 7 - config.aws_attributes = { - expires: 1.week.from_now.httpdate, - cache_control: 'max-age=604800' - } - config.aws_credentials = { - access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'), - secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'), - region: ENV.fetch('AWS_REGION'), # Required - stub_responses: Rails.env.test? # Optional, avoid hitting S3 actual during tests - } - - + config.permissions = 0666 + config.directory_permissions = 0777 + config.storage = :file end diff --git a/ssbackend/symptomsurvey_backend b/ssbackend/symptomsurvey_backend deleted file mode 160000 index b93eeef..0000000 --- a/ssbackend/symptomsurvey_backend +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b93eeef65350f78779383479d0831189d7d46df2