image cleanup and some seasonal texts

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/HubFeenixMakers/merged
-  revision: 5202ea58c197c414c1194ad3e1a91acd6c01a4b9
+  revision: bafe142a3bdc26d74a951d3ea5a045ba57b042d6
   specs:
     merged (0.1.0)
       active_hash
@@ -123,7 +123,7 @@ GEM
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     crass (1.0.6)
     date (3.3.3)
     db_text_search (1.0.0)

app/views/layouts/_footer.haml

@@ -14,6 +14,9 @@
               %li
                 %a.text-gray-700.transition.hover:opacity-75{:href => "/helsinki_turku"}
                   Helsinki & Turkku
+              %li
+                %a.text-gray-700.transition.hover:opacity-75{:href => "/four_seasons"}
+                  Four Seasons
               %li
                 %a.text-gray-700.transition.hover:opacity-75{:href => "/in_summer"}
                   In Summer

merged/cards.yml

@@ -438,305 +438,110 @@
   :id: 35
   :image_id: 116
 - :section_id: 66
-  :index: 1
+  :index: 3
   :header: Winter
-  :text: ''
+  :text: "Winter is a long and dark, but also clear and beautiful.\r\nX-mas is darkest,
+    but even February is coldest, it gets light again"
   :options:
-    background: none
+    background: solid_blue
     text_color: white
     text_align: center
-  :updated_at: 2023-01-24 01:41:35.051846905 +02:00
+    subheader: ''
-  :updated_by: maijanposteja@gmail.com
+    order: right
+    button_link: ''
+    button_text: ''
+  :updated_at: 2023-01-25 00:53:43.013237916 +02:00
+  :updated_by: torsten@villataika.fi
   :id: 40
   :image_id: 122
 - :section_id: 66
-  :index: 4
+  :index: 2
   :header: Autumn
-  :text: ''
+  :text: We make the most out of the autmn, enjoying the memory of warm, before it
+    gets dark.
   :options:
-    background: none
+    background: solid_red
     text_color: white
     text_align: center
-  :updated_at: 2023-01-24 01:24:23.613265653 +02:00
+    subheader: ''
-  :updated_by: maijanposteja@gmail.com
+    order: right
+    button_link: ''
+    button_text: ''
+  :updated_at: 2023-01-25 00:48:41.959065314 +02:00
+  :updated_by: torsten@villataika.fi
   :id: 41
   :image_id: 123
 - :section_id: 66
-  :index: 2
+  :index: 4
   :header: Spring
-  :text: ''
+  :text: By the time spring comes, we have forgotten the last summer and are glad
+    to see light and life again, so urgently coming forth
   :options:
-    background: none
+    background: light_blue
-    text_color: white
+    text_color: black
     text_align: center
-  :updated_at: 2023-01-24 01:41:51.780471602 +02:00
+    subheader: ''
-  :updated_by: !ruby/object:Member
+    order: right
-    concise_attributes:
+    button_link: ''
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
+    button_text: ''
-      name: id
+  :updated_at: 2023-01-25 00:46:24.727773085 +02:00
-      value_before_type_cast: 1
+  :updated_by: torsten@villataika.fi
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: name
-      value_before_type_cast: Maija Leminen
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: bio
-      value_before_type_cast: "cvbbgbdfgb\r\n\r\ndfg\r\nsdg\r\ndfg\r\nh"
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: picture
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: public
-      value_before_type_cast: false
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: created_at
-      value_before_type_cast: 2023-01-13 18:23:19.076522000 Z
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: updated_at
-      value_before_type_cast: 2023-01-18 09:28:41.734567000 Z
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: email
-      value_before_type_cast: maijanposteja@gmail.com
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: encrypted_password
-      value_before_type_cast: "$2a$12$hGgWjWBftikgJ6wOJcjfUu.gFpsPFba5tTVNjeHH0Jzkcqw685enS"
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: reset_password_token
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: reset_password_sent_at
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: remember_created_at
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: confirmation_token
-      value_before_type_cast: x1druYuXWwy9L8Uy3GnS
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: confirmed_at
-      value_before_type_cast: 2023-01-13 18:24:46.555456000 Z
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: confirmation_sent_at
-      value_before_type_cast: 2023-01-13 18:23:19.076639000 Z
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: unconfirmed_email
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: arrived
-      value_before_type_cast: '2023-01-13'
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: left
-      value_before_type_cast: '2023-01-13'
-    new_record: false
-    active_record_yaml_version: 2
   :id: 42
   :image_id: 124
 - :section_id: 66
-  :index: 3
+  :index: 1
   :header: Summer
-  :text: ''
+  :text: Summer is easy, but short and active. Beautiful, especially after the long
+    winter.
   :options:
-    background: none
+    background: light_orange
-    text_color: white
+    text_color: black
     text_align: center
-  :updated_at: 2023-01-24 01:41:58.251901271 +02:00
+    subheader: ''
-  :updated_by: !ruby/object:Member
+    order: right
-    concise_attributes:
+    button_link: ''
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
+    button_text: ''
-      name: id
+  :updated_at: 2023-01-25 00:47:43.929239825 +02:00
-      value_before_type_cast: 1
+  :updated_by: torsten@villataika.fi
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: name
-      value_before_type_cast: Maija Leminen
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: bio
-      value_before_type_cast: "cvbbgbdfgb\r\n\r\ndfg\r\nsdg\r\ndfg\r\nh"
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: picture
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: public
-      value_before_type_cast: false
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: created_at
-      value_before_type_cast: 2023-01-13 18:23:19.076522000 Z
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: updated_at
-      value_before_type_cast: 2023-01-18 09:28:41.734567000 Z
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: email
-      value_before_type_cast: maijanposteja@gmail.com
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: encrypted_password
-      value_before_type_cast: "$2a$12$hGgWjWBftikgJ6wOJcjfUu.gFpsPFba5tTVNjeHH0Jzkcqw685enS"
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: reset_password_token
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: reset_password_sent_at
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: remember_created_at
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: confirmation_token
-      value_before_type_cast: x1druYuXWwy9L8Uy3GnS
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: confirmed_at
-      value_before_type_cast: 2023-01-13 18:24:46.555456000 Z
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: confirmation_sent_at
-      value_before_type_cast: 2023-01-13 18:23:19.076639000 Z
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: unconfirmed_email
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: arrived
-      value_before_type_cast: '2023-01-13'
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: left
-      value_before_type_cast: '2023-01-13'
-    new_record: false
-    active_record_yaml_version: 2
   :id: 43
   :image_id: 125
 - :section_id: 71
   :index: 2
   :header: Winter
-  :text: Some tekst here
+  :text: "Usually there is varying amounts of snow from beginning of November to the
+    end of march. Sometimes it melts, often not.\r\nWe only call it cold when it gets
+    below minus 15 (and it does!). And it get **dark** , which we see as the opposite
+    of the light in summer.\r\nVery rarely we see a Boreals."
   :options:
     background: none
     text_color: none
     text_align: left
     order: left
     subheader: ''
-    button_link: ''
+    button_link: "/in_winter"
-    button_text: ''
+    button_text: Winter
-  :updated_at: 2023-01-24 02:48:48.374892871 +02:00
+  :updated_at: 2023-01-24 23:11:23.962046547 +02:00
-  :updated_by: !ruby/object:Member
+  :updated_by: torsten@villataika.fi
-    concise_attributes:
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: id
-      value_before_type_cast: 1
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: name
-      value_before_type_cast: Maija Leminen
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: bio
-      value_before_type_cast: "cvbbgbdfgb\r\n\r\ndfg\r\nsdg\r\ndfg\r\nh"
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: picture
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: public
-      value_before_type_cast: false
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: created_at
-      value_before_type_cast: 2023-01-13 18:23:19.076522000 Z
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: updated_at
-      value_before_type_cast: 2023-01-18 09:28:41.734567000 Z
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: email
-      value_before_type_cast: maijanposteja@gmail.com
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: encrypted_password
-      value_before_type_cast: "$2a$12$hGgWjWBftikgJ6wOJcjfUu.gFpsPFba5tTVNjeHH0Jzkcqw685enS"
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: reset_password_token
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: reset_password_sent_at
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: remember_created_at
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: confirmation_token
-      value_before_type_cast: x1druYuXWwy9L8Uy3GnS
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: confirmed_at
-      value_before_type_cast: 2023-01-13 18:24:46.555456000 Z
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: confirmation_sent_at
-      value_before_type_cast: 2023-01-13 18:23:19.076639000 Z
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: unconfirmed_email
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: arrived
-      value_before_type_cast: '2023-01-13'
-    - !ruby/object:ActiveModel::Attribute::FromDatabase
-      name: left
-      value_before_type_cast: '2023-01-13'
-    new_record: false
-    active_record_yaml_version: 2
-  :id: 44
-  :image_id: 130
-- :section_id: 71
-  :index: 1
-  :header: Winter
-  :text: "November-March\r\nSome teksts here"
-  :options:
-    background: none
-    text_color: none
-    text_align: left
-    order: left
-    subheader: ''
-    button_link: ''
-    button_text: ''
-  :updated_at: 2023-01-24 02:49:25.768466063 +02:00
-  :updated_by: maijanposteja@gmail.com
   :id: 45
   :image_id: 127
 - :section_id: 71
-  :index: 5
+  :index: 1
-  :header: Spring
-  :text: "April-May\r\nsome text here"
-  :options:
-    background: none
-    text_color: none
-    text_align: left
-    order: left
-    subheader: ''
-    button_link: ''
-    button_text: ''
-  :updated_at: 2023-01-24 02:50:11.031850388 +02:00
-  :updated_by: maijanposteja@gmail.com
-  :id: 46
-  :image_id: 131
-- :section_id: 71
-  :index: 3
   :header: Summer
-  :text: "June-August\r\nSome texts here"
+  :text: "Everybodu off course enjoys the summer, none more than the Fins (after a
+    long winter)\r\nFinish summer is never too hot, just around 25. Still the lakes
+    heat up and swimming in the near by lake is a daily activity. "
   :options:
     background: none
     text_color: none
     text_align: left
     order: left
     subheader: ''
-    button_link: ''
+    button_link: "/in_summer"
-    button_text: ''
+    button_text: Summer
-  :updated_at: 2023-01-24 02:50:45.664458627 +02:00
+  :updated_at: 2023-01-25 00:56:33.466535830 +02:00
-  :updated_by: maijanposteja@gmail.com
+  :updated_by: torsten@villataika.fi
   :id: 47
   :image_id: 128
-- :section_id: 71
-  :index: 4
-  :header: Summer
-  :text: Some text here
-  :options:
-    background: none
-    text_color: none
-    text_align: left
-    order: left
-    subheader: ''
-    button_link: ''
-    button_text: ''
-  :updated_at: 2023-01-24 02:48:06.298411084 +02:00
-  :updated_by: maijanposteja@gmail.com
-  :id: 48
-  :image_id: 134
-- :section_id: 71
-  :index: 6
-  :header: Autumn
-  :text: "September-October\r\nSome text here"
-  :options:
-    background: none
-    text_color: none
-    text_align: left
-    order: left
-    subheader: ''
-    button_link: ''
-    button_text: ''
-  :updated_at: 2023-01-24 02:51:31.113491380 +02:00
-  :updated_by: maijanposteja@gmail.com
-  :id: 49
-  :image_id: 129
 - :section_id: 51
   :index: 6
   :header: Downhill skiing

merged/images.yml

@@ -466,11 +466,11 @@
   :type: jpg
   :tags: ''
   :width: 1009
-  :height: 1346
+  :height: 673
-  :size: 427
+  :size: 220
   :id: 115
-  :updated_at: 2023-01-23 22:38:55.987855001 +02:00
+  :updated_at: 2023-01-24 23:21:09.128383841 +02:00
-  :updated_by: maijanposteja@gmail.com
+  :updated_by: torsten@villataika.fi
 - :name: outdoors 2
   :type: jpg
   :tags: ''
@@ -510,48 +510,48 @@
 - :name: winter trees
   :type: jpg
   :tags: ''
-  :width: 4128
+  :width: 759
-  :height: 3096
+  :height: 759
-  :size: 3609
+  :size: 277
   :id: 122
-  :updated_at: 2023-01-24 01:21:35.137963096 +02:00
+  :updated_at: 2023-01-25 00:20:56.480521845 +02:00
-  :updated_by: maijanposteja@gmail.com
+  :updated_by: torsten@villataika.fi
 - :name: autumn
   :type: jpg
   :tags: ''
-  :width: 4128
+  :width: 763
-  :height: 3096
+  :height: 765
-  :size: 5515
+  :size: 458
   :id: 123
-  :updated_at: 2023-01-24 01:23:52.682101416 +02:00
+  :updated_at: 2023-01-25 00:20:42.883663688 +02:00
-  :updated_by: maijanposteja@gmail.com
+  :updated_by: torsten@villataika.fi
 - :name: spring
   :type: jpg
   :tags: ''
-  :width: 4128
+  :width: 765
-  :height: 3096
+  :height: 765
-  :size: 4823
+  :size: 325
   :id: 124
-  :updated_at: 2023-01-24 01:34:07.424114970 +02:00
+  :updated_at: 2023-01-25 00:21:03.899165279 +02:00
-  :updated_by: maijanposteja@gmail.com
+  :updated_by: torsten@villataika.fi
 - :name: Lilac
   :type: jpg
   :tags: ''
-  :width: 4128
+  :width: 760
-  :height: 3096
+  :height: 760
-  :size: 3475
+  :size: 245
   :id: 125
-  :updated_at: 2023-01-24 01:35:24.330786454 +02:00
+  :updated_at: 2023-01-25 00:21:11.605158123 +02:00
-  :updated_by: maijanposteja@gmail.com
+  :updated_by: torsten@villataika.fi
 - :name: northern lights
   :type: jpg
   :tags: ''
-  :width: 1600
+  :width: 1035
-  :height: 1068
+  :height: 518
-  :size: 120
+  :size: 50
   :id: 127
-  :updated_at: 2023-01-24 01:47:54.728733510 +02:00
+  :updated_at: 2023-01-24 23:08:39.423738097 +02:00
-  :updated_by: maijanposteja@gmail.com
+  :updated_by: torsten@villataika.fi
 - :name: summer lake
   :type: jpg
   :tags: ''

merged/pages.yml

@@ -41,3 +41,13 @@
   :type: page
   :updated_by: maijanposteja@gmail.com
   :id: 13
+- :name: in_summer
+  :updated_at: 2023-01-24 22:44:37.221037641 +02:00
+  :type: page
+  :updated_by: torsten@villataika.fi
+  :id: 14
+- :name: in_winter
+  :updated_at: 2023-01-24 22:44:54.716492377 +02:00
+  :type: page
+  :updated_by: torsten@villataika.fi
+  :id: 15

merged/sections.yml

@@ -429,23 +429,39 @@
 - :template: section_cards
   :index: 1
   :page_id: 13
-  :updated_at: 2023-01-24 01:10:20.884155873 +02:00
+  :updated_at: 2023-01-25 00:12:12.444766597 +02:00
-  :updated_by: maijanposteja@gmail.com
+  :updated_by: torsten@villataika.fi
   :id: 66
-  :card_template: card_full_image
+  :card_template: card_normal_square
-  :options: {}
+  :options:
+    background: white
+    columns: '4'
+    subheader: ''
+    text_color: none
+    text_align: center
   :header: Finland's 4 seasons
-  :text: ''
+  :text: "Finland has four seasons, or in other words a **real** winter.\r\n\r\nSummer
+    is easy, beautiful, especially after the long winter. Autumn gentle even sometimes
+    a little too fast. Winter is a long and dark, but also clear and beautiful.\r\nBy
+    the time spring comes, we have forgotten the last summer and are glad to see light
+    and life again, so urgently coming forth.And then it starts again\r\nEach season
+    it quite it's own and beatiful, and here we want to introduce a little what that
+    means.\r\n"
 - :template: section_cards
   :index: 2
   :page_id: 13
-  :updated_at: 2023-01-24 02:28:39.840506708 +02:00
+  :updated_at: 2023-01-25 01:14:46.130313604 +02:00
-  :updated_by: maijanposteja@gmail.com
+  :updated_by: torsten@villataika.fi
   :id: 71
   :card_template: card_wide_square
-  :options: {}
+  :options:
-  :header: ''
+    background: white
-  :text: ''
+    columns: '2'
+    subheader: ''
+    text_color: none
+    text_align: center
+  :header: Summer and winter
+  :text: we've dedicated a page for the main seasons, you can fill in the dots between
   :image_id: 0
 - :template: section_cards
   :index: 4
@@ -460,3 +476,31 @@
     subheader: ''
     text_color: none
     text_align: left
+- :template: section_cards
+  :index: 1
+  :page_id: 14
+  :updated_at: 2023-01-24 22:44:41.910577819 +02:00
+  :updated_by: torsten@villataika.fi
+  :id: 73
+  :card_template: card_full_image
+  :options: {}
+- :template: section_cards
+  :index: 1
+  :page_id: 15
+  :updated_at: 2023-01-24 22:44:56.217394855 +02:00
+  :updated_by: torsten@villataika.fi
+  :id: 74
+  :card_template: card_full_image
+  :options: {}
+- :template: section_half_image
+  :index: 2
+  :page_id: 14
+  :updated_at: 2023-01-24 23:25:19.322802742 +02:00
+  :updated_by: torsten@villataika.fi
+  :id: 75
+  :card_template: ''
+  :options: {}
+  :image_id: 115
+  :header: Summer in Finland
+  :text: "Long long nights, at midsummer the sun goes down at eleven, it never really
+    gets dark.\r\n \r\n"