diff --git a/app/views/welcome/_when_where.html.erb b/app/views/welcome/_when_where.html.erb
index 9352222..eddaf10 100644
--- a/app/views/welcome/_when_where.html.erb
+++ b/app/views/welcome/_when_where.html.erb
@@ -2,7 +2,7 @@
-
When & Where
+ Wann? & Wo?
@@ -11,11 +11,11 @@
<%= render partial: 'calendar_svg' %>
<%- end %>
- 12:30pm – late
+ 16:00 – offen
<%= t :wedding_date %>
-
<%= link_to 'Add to Calendar', 'wedding.ics' %>
+
<%= link_to 'Zum Kalender hinzufügen', 'wedding.ics' %>
<%= link_to @google_maps_url do -%>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 9a41767..b16d3be 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -8,6 +8,21 @@ Rails.application.configure do
# since you don't have to restart the web server when you make code changes.
config.cache_classes = false
+ Rails.application.routes.default_url_options[:host] = ENV.fetch("APP_HOST", "0.0.0.0")
+ Rails.application.routes.default_url_options[:port] = ENV.fetch("APP_PORT", 3000)
+
+ # Force Rails to generate URLs with your hostname instead of localhost
+ Rails.application.routes.default_url_options = {
+ host: ENV.fetch("APP_HOST", "beere5"),
+ port: ENV.fetch("APP_PORT", 3000)
+ }
+
+ # Force Rails to generate URLs with your hostname instead of localhost
+ Rails.application.routes.default_url_options = {
+ host: ENV.fetch("APP_HOST", "wedding.linepe.de"),
+ port: ENV.fetch("APP_PORT", 3000)
+ }
+
# Do not eager load code on boot.
config.eager_load = false
@@ -64,4 +79,4 @@ Rails.application.configure do
config.action_mailer.default_url_options = {
host: ENV['CANONICAL_HOST'], port: 3000
}
-end
+end
\ No newline at end of file
diff --git a/config/environments/production.rb b/config/environments/production.rb
index f971248..8b09c6b 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -6,6 +6,21 @@ Rails.application.configure do
# Code is not reloaded between requests.
config.cache_classes = true
+ Rails.application.routes.default_url_options[:host] = ENV.fetch("APP_HOST", "0.0.0.0")
+ Rails.application.routes.default_url_options[:port] = ENV.fetch("APP_PORT", 3000)
+
+ # Force Rails to generate URLs with your hostname instead of localhost
+ Rails.application.routes.default_url_options = {
+ host: ENV.fetch("APP_HOST", "beere5"),
+ port: ENV.fetch("APP_PORT", 3000)
+ }
+
+ # Force Rails to generate URLs with your hostname instead of localhost
+ Rails.application.routes.default_url_options = {
+ host: ENV.fetch("APP_HOST", "wedding.linepe.de"),
+ port: ENV.fetch("APP_PORT", 3000)
+ }
+
# Eager load code on boot. This eager loads most of Rails and
# your application in memory, allowing both threaded web servers
# and those relying on copy on write to perform better.
diff --git a/config/environments/test.rb b/config/environments/test.rb
index e6078ba..6b66bb3 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -8,6 +8,20 @@ Rails.application.configure do
# your test database is "scratch space" for the test suite and is wiped
# and recreated between test runs. Don't rely on the data there!
config.cache_classes = true
+ Rails.application.routes.default_url_options[:host] = ENV.fetch("APP_HOST", "0.0.0.0")
+ Rails.application.routes.default_url_options[:port] = ENV.fetch("APP_PORT", 3000)
+
+ # Force Rails to generate URLs with your hostname instead of localhost
+ Rails.application.routes.default_url_options = {
+ host: ENV.fetch("APP_HOST", "beere5"),
+ port: ENV.fetch("APP_PORT", 3000)
+ }
+
+ # Force Rails to generate URLs with your hostname instead of localhost
+ Rails.application.routes.default_url_options = {
+ host: ENV.fetch("APP_HOST", "wedding.linepe.de"),
+ port: ENV.fetch("APP_PORT", 3000)
+ }
# Do not eager load code on boot. This avoids loading your whole application
# just for the purpose of running a single test. If you are using a tool that
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c7e95b3..f421cbd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -30,8 +30,8 @@
# available at http://guides.rubyonrails.org/i18n.html.
en:
- wedding_name: "Jack & Jill's Wedding"
- wedding_couple_names: 'Jack & Jill'
- wedding_date: 'Saturday, 1 January 2000'
- wedding_location: 'South Pole'
- photo_credits: 'Photo Credits: Pexels'
+ wedding_name: "Caro & Rene's freie Trauung"
+ wedding_couple_names: 'Caro & Rene'
+ wedding_date: 'Samstag, 25 April 2025'
+ wedding_location: 'Klosterkirche, Remscheid'
+ photo_credits: 'Photo Credits: Rene'
diff --git a/db/schema.rb b/db/schema.rb
index c3d58fd..ef89897 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,11 +10,11 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20180804103058) do
+ActiveRecord::Schema.define(version: 2018_08_04_103058) do
# These are extensions that must be enabled in order to support this database
- enable_extension "plpgsql"
enable_extension "citext"
+ enable_extension "plpgsql"
create_table "active_admin_comments", force: :cascade do |t|
t.string "namespace"
diff --git a/docker-compose.yml b/docker-compose.yml
index 3bd4e83..27830b8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,8 +9,10 @@ services:
- '5432:5432'
web:
+ environment:
+ CANONICAL_URL: beere5:3033, wedding.linepe.de
build: .
ports:
- - '3000:3000'
+ - '3033:3000'
links:
- db