diff --git a/Gemfile b/Gemfile index 5dd813e..efb2690 100644 --- a/Gemfile +++ b/Gemfile @@ -18,6 +18,9 @@ gem "sassc-rails" gem 'haml-rails' gem 'html2haml' gem 'devise' +gem 'devise-async' +gem "sucker_punch", "~> 3.1" + gem 'carrierwave', '>= 3.0.0.beta', '< 4.0' gem "ruby2js" , git: "https://github.com/ruby2js/ruby2js/" , branch: "haml_fix" @@ -27,7 +30,9 @@ gem "simple_form" , "5.1.0" gem "simple_form_tailwind_css" gem 'kaminari' gem 'ransack' -gem "devise-async" + +gem "pundit", "~> 2.3" + gem "passenger" , "6.0.15" , require: "phusion_passenger/rack_handler" gem "bootsnap", require: false @@ -51,7 +56,3 @@ group :test do gem "selenium-webdriver" gem "webdrivers" end - -gem "pundit", "~> 2.3" - -gem "sucker_punch", "~> 3.1" diff --git a/Gemfile.lock b/Gemfile.lock index 6226137..11eee8e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/HubFeenixMakers/merged - revision: 5b0ccafc0e78cc72d95865abf001c7b65b69a96f + revision: 78f47614fa2e160990f74b23c7e63d856d913655 specs: merged (0.1.0) active_hash @@ -147,7 +147,7 @@ GEM formatador (1.1.0) friendly_id (5.5.0) activerecord (>= 4.0.0) - git (1.13.1) + git (1.13.2) addressable (~> 2.8) rchardet (~> 1.8) globalid (1.1.0) @@ -222,7 +222,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.8) - mail (2.8.0.1) + mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop @@ -250,7 +250,7 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.8) - nokogiri (1.14.1-x86_64-linux) + nokogiri (1.14.2-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) @@ -264,7 +264,7 @@ GEM sanitize open4 (1.3.4) orm_adapter (0.5.0) - parser (3.2.0.0) + parser (3.2.1.0) ast (~> 2.4.1) passenger (6.0.15) rack @@ -415,7 +415,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.6) + zeitwerk (2.6.7) PLATFORMS x86_64-linux diff --git a/app/assets/images/merged/3.webp b/app/assets/images/merged/1.webp similarity index 100% rename from app/assets/images/merged/3.webp rename to app/assets/images/merged/1.webp diff --git a/app/assets/images/merged/70.jpg b/app/assets/images/merged/10.jpg similarity index 100% rename from app/assets/images/merged/70.jpg rename to app/assets/images/merged/10.jpg diff --git a/app/assets/images/merged/71.jpg b/app/assets/images/merged/11.jpg similarity index 100% rename from app/assets/images/merged/71.jpg rename to app/assets/images/merged/11.jpg diff --git a/app/assets/images/merged/72.jpg b/app/assets/images/merged/12.jpg similarity index 100% rename from app/assets/images/merged/72.jpg rename to app/assets/images/merged/12.jpg diff --git a/app/assets/images/merged/12.webp b/app/assets/images/merged/12.webp deleted file mode 100644 index 63b88d0..0000000 Binary files a/app/assets/images/merged/12.webp and /dev/null differ diff --git a/app/assets/images/merged/120.jpg b/app/assets/images/merged/120.jpg deleted file mode 100644 index de8af5b..0000000 Binary files a/app/assets/images/merged/120.jpg and /dev/null differ diff --git a/app/assets/images/merged/129.jpg b/app/assets/images/merged/129.jpg deleted file mode 100644 index c3faa90..0000000 Binary files a/app/assets/images/merged/129.jpg and /dev/null differ diff --git a/app/assets/images/merged/73.jpg b/app/assets/images/merged/13.jpg similarity index 100% rename from app/assets/images/merged/73.jpg rename to app/assets/images/merged/13.jpg diff --git a/app/assets/images/merged/131.jpg b/app/assets/images/merged/131.jpg deleted file mode 100644 index 40723d7..0000000 Binary files a/app/assets/images/merged/131.jpg and /dev/null differ diff --git a/app/assets/images/merged/136.jpg b/app/assets/images/merged/136.jpg deleted file mode 100644 index 32de7de..0000000 Binary files a/app/assets/images/merged/136.jpg and /dev/null differ diff --git a/app/assets/images/merged/74.jpg b/app/assets/images/merged/14.jpg similarity index 100% rename from app/assets/images/merged/74.jpg rename to app/assets/images/merged/14.jpg diff --git a/app/assets/images/merged/140.jpg b/app/assets/images/merged/140.jpg deleted file mode 100644 index 8720847..0000000 Binary files a/app/assets/images/merged/140.jpg and /dev/null differ diff --git a/app/assets/images/merged/75.jpg b/app/assets/images/merged/15.jpg similarity index 100% rename from app/assets/images/merged/75.jpg rename to app/assets/images/merged/15.jpg diff --git a/app/assets/images/merged/76.jpg b/app/assets/images/merged/16.jpg similarity index 100% rename from app/assets/images/merged/76.jpg rename to app/assets/images/merged/16.jpg diff --git a/app/assets/images/merged/77.jpg b/app/assets/images/merged/17.jpg similarity index 100% rename from app/assets/images/merged/77.jpg rename to app/assets/images/merged/17.jpg diff --git a/app/assets/images/merged/78.jpg b/app/assets/images/merged/18.jpg similarity index 100% rename from app/assets/images/merged/78.jpg rename to app/assets/images/merged/18.jpg diff --git a/app/assets/images/merged/79.jpg b/app/assets/images/merged/19.jpg similarity index 100% rename from app/assets/images/merged/79.jpg rename to app/assets/images/merged/19.jpg diff --git a/app/assets/images/merged/19.webp b/app/assets/images/merged/19.webp deleted file mode 100644 index c1c7b34..0000000 Binary files a/app/assets/images/merged/19.webp and /dev/null differ diff --git a/app/assets/images/merged/2.webp b/app/assets/images/merged/2.webp index eeb1f54..c1c7b34 100644 Binary files a/app/assets/images/merged/2.webp and b/app/assets/images/merged/2.webp differ diff --git a/app/assets/images/merged/81.png b/app/assets/images/merged/20.png similarity index 100% rename from app/assets/images/merged/81.png rename to app/assets/images/merged/20.png diff --git a/app/assets/images/merged/82.png b/app/assets/images/merged/21.png similarity index 100% rename from app/assets/images/merged/82.png rename to app/assets/images/merged/21.png diff --git a/app/assets/images/merged/83.png b/app/assets/images/merged/22.png similarity index 100% rename from app/assets/images/merged/83.png rename to app/assets/images/merged/22.png diff --git a/app/assets/images/merged/93.webp b/app/assets/images/merged/23.webp similarity index 100% rename from app/assets/images/merged/93.webp rename to app/assets/images/merged/23.webp diff --git a/app/assets/images/merged/99.jpg b/app/assets/images/merged/24.jpg similarity index 100% rename from app/assets/images/merged/99.jpg rename to app/assets/images/merged/24.jpg diff --git a/app/assets/images/merged/100.jpg b/app/assets/images/merged/25.jpg similarity index 100% rename from app/assets/images/merged/100.jpg rename to app/assets/images/merged/25.jpg diff --git a/app/assets/images/merged/102.jpg b/app/assets/images/merged/26.jpg similarity index 100% rename from app/assets/images/merged/102.jpg rename to app/assets/images/merged/26.jpg diff --git a/app/assets/images/merged/103.jpg b/app/assets/images/merged/27.jpg similarity index 100% rename from app/assets/images/merged/103.jpg rename to app/assets/images/merged/27.jpg diff --git a/app/assets/images/merged/110.jpg b/app/assets/images/merged/28.jpg similarity index 100% rename from app/assets/images/merged/110.jpg rename to app/assets/images/merged/28.jpg diff --git a/app/assets/images/merged/112.png b/app/assets/images/merged/29.png similarity index 100% rename from app/assets/images/merged/112.png rename to app/assets/images/merged/29.png diff --git a/app/assets/images/merged/23.png b/app/assets/images/merged/3.png similarity index 100% rename from app/assets/images/merged/23.png rename to app/assets/images/merged/3.png diff --git a/app/assets/images/merged/113.jpg b/app/assets/images/merged/30.jpg similarity index 100% rename from app/assets/images/merged/113.jpg rename to app/assets/images/merged/30.jpg diff --git a/app/assets/images/merged/114.jpg b/app/assets/images/merged/31.jpg similarity index 100% rename from app/assets/images/merged/114.jpg rename to app/assets/images/merged/31.jpg diff --git a/app/assets/images/merged/115.jpg b/app/assets/images/merged/32.jpg similarity index 100% rename from app/assets/images/merged/115.jpg rename to app/assets/images/merged/32.jpg diff --git a/app/assets/images/merged/116.jpg b/app/assets/images/merged/33.jpg similarity index 100% rename from app/assets/images/merged/116.jpg rename to app/assets/images/merged/33.jpg diff --git a/app/assets/images/merged/117.jpg b/app/assets/images/merged/34.jpg similarity index 100% rename from app/assets/images/merged/117.jpg rename to app/assets/images/merged/34.jpg diff --git a/app/assets/images/merged/118.jpg b/app/assets/images/merged/35.jpg similarity index 100% rename from app/assets/images/merged/118.jpg rename to app/assets/images/merged/35.jpg diff --git a/app/assets/images/merged/122.jpg b/app/assets/images/merged/36.jpg similarity index 100% rename from app/assets/images/merged/122.jpg rename to app/assets/images/merged/36.jpg diff --git a/app/assets/images/merged/123.jpg b/app/assets/images/merged/37.jpg similarity index 100% rename from app/assets/images/merged/123.jpg rename to app/assets/images/merged/37.jpg diff --git a/app/assets/images/merged/124.jpg b/app/assets/images/merged/38.jpg similarity index 100% rename from app/assets/images/merged/124.jpg rename to app/assets/images/merged/38.jpg diff --git a/app/assets/images/merged/125.jpg b/app/assets/images/merged/39.jpg similarity index 100% rename from app/assets/images/merged/125.jpg rename to app/assets/images/merged/39.jpg diff --git a/app/assets/images/merged/4.jpg b/app/assets/images/merged/4.jpg new file mode 100644 index 0000000..803ae56 Binary files /dev/null and b/app/assets/images/merged/4.jpg differ diff --git a/app/assets/images/merged/127.jpg b/app/assets/images/merged/40.jpg similarity index 100% rename from app/assets/images/merged/127.jpg rename to app/assets/images/merged/40.jpg diff --git a/app/assets/images/merged/128.jpg b/app/assets/images/merged/41.jpg similarity index 100% rename from app/assets/images/merged/128.jpg rename to app/assets/images/merged/41.jpg diff --git a/app/assets/images/merged/130.jpg b/app/assets/images/merged/42.jpg similarity index 100% rename from app/assets/images/merged/130.jpg rename to app/assets/images/merged/42.jpg diff --git a/app/assets/images/merged/42.webp b/app/assets/images/merged/42.webp deleted file mode 100644 index 6ba4cf4..0000000 Binary files a/app/assets/images/merged/42.webp and /dev/null differ diff --git a/app/assets/images/merged/135.jpg b/app/assets/images/merged/43.jpg similarity index 100% rename from app/assets/images/merged/135.jpg rename to app/assets/images/merged/43.jpg diff --git a/app/assets/images/merged/137.jpg b/app/assets/images/merged/44.jpg similarity index 100% rename from app/assets/images/merged/137.jpg rename to app/assets/images/merged/44.jpg diff --git a/app/assets/images/merged/138.jpg b/app/assets/images/merged/45.jpg similarity index 100% rename from app/assets/images/merged/138.jpg rename to app/assets/images/merged/45.jpg diff --git a/app/assets/images/merged/139.jpg b/app/assets/images/merged/46.jpg similarity index 100% rename from app/assets/images/merged/139.jpg rename to app/assets/images/merged/46.jpg diff --git a/app/assets/images/merged/47.jpg b/app/assets/images/merged/47.jpg index 803ae56..8720847 100644 Binary files a/app/assets/images/merged/47.jpg and b/app/assets/images/merged/47.jpg differ diff --git a/app/assets/images/merged/141.jpg b/app/assets/images/merged/48.jpg similarity index 100% rename from app/assets/images/merged/141.jpg rename to app/assets/images/merged/48.jpg diff --git a/app/assets/images/merged/142.jpg b/app/assets/images/merged/49.jpg similarity index 100% rename from app/assets/images/merged/142.jpg rename to app/assets/images/merged/49.jpg diff --git a/app/assets/images/merged/61.png b/app/assets/images/merged/5.png similarity index 100% rename from app/assets/images/merged/61.png rename to app/assets/images/merged/5.png diff --git a/app/assets/images/merged/143.webp b/app/assets/images/merged/50.webp similarity index 100% rename from app/assets/images/merged/143.webp rename to app/assets/images/merged/50.webp diff --git a/app/assets/images/merged/62.png b/app/assets/images/merged/6.png similarity index 100% rename from app/assets/images/merged/62.png rename to app/assets/images/merged/6.png diff --git a/app/assets/images/merged/65.png b/app/assets/images/merged/65.png deleted file mode 100644 index 1768d59..0000000 Binary files a/app/assets/images/merged/65.png and /dev/null differ diff --git a/app/assets/images/merged/63.png b/app/assets/images/merged/7.png similarity index 100% rename from app/assets/images/merged/63.png rename to app/assets/images/merged/7.png diff --git a/app/assets/images/merged/64.png b/app/assets/images/merged/8.png similarity index 100% rename from app/assets/images/merged/64.png rename to app/assets/images/merged/8.png diff --git a/app/assets/images/merged/69.jpg b/app/assets/images/merged/9.jpg similarity index 100% rename from app/assets/images/merged/69.jpg rename to app/assets/images/merged/9.jpg diff --git a/app/assets/images/merged/9.webp b/app/assets/images/merged/9.webp deleted file mode 100644 index 7120dad..0000000 Binary files a/app/assets/images/merged/9.webp and /dev/null differ diff --git a/merged/cards.yml b/merged/cards.yml index 4760492..c94fb5e 100644 --- a/merged/cards.yml +++ b/merged/cards.yml @@ -1,15 +1,14 @@ --- -- :section_id: 52 +- :section_id: 8 :index: 1 :header: Transportation - :text: "- **Car** - The Hub provides a car at cost price (0,20€/ km.) - Little driving test required before borrowing it first time. \r\n- **Bus** - - There’s a bus stop right in front of the house. On the weekdays, busses go to - Karjaa (7 km -grocery stores, post office, train station etc.) and to Helsinki. - [see here](https://www.matkahuolto.fi/en).\r\n- **Bicycle** - We have a few bikes - that can be borrowed for everyday use.\r\n- **Train** - The nearby train station - in Karjaa is perfect for longer travels, for example one hour to Helsinki, [see - more](https://www.vr.fi/en).\r\n" + :text: "- **Car** - The Hub provides a car at cost price (0,20€/ km.) Little driving + test required before borrowing it first time. \r\n- **Bus** - There’s a bus stop + right in front of the house. On the weekdays, busses go to Karjaa (7 km -grocery + stores, post office, train station etc.) and to Helsinki. [see here](https://www.matkahuolto.fi/en).\r\n- + **Bicycle** - We have a few bikes that can be borrowed for everyday use.\r\n- + **Train** - The nearby train station in Karjaa is perfect for longer travels, + for example one hour to Helsinki, [see more](https://www.vr.fi/en).\r\n" :options: background: none text_color: none @@ -20,9 +19,9 @@ button_text: '' :updated_at: 2023-01-25 17:03:36.978214748 +02:00 :updated_by: torsten@villataika.fi - :id: 6 - :image_id: 71 -- :section_id: 52 + :id: 1 + :image_id: 11 +- :section_id: 8 :index: 2 :header: Common utilities :text: "- **Laundry room** - washing machine, iron \r\n- **Kitchen** - common kitchen @@ -39,9 +38,9 @@ button_text: '' :updated_at: 2023-01-25 17:03:40.690983773 +02:00 :updated_by: torsten@villataika.fi - :id: 7 - :image_id: 102 -- :section_id: 52 + :id: 2 + :image_id: 26 +- :section_id: 8 :index: 3 :header: Clothing :text: "## You can borrow **work clothes** and **warm winter clothes** for your @@ -58,9 +57,9 @@ button_text: '' :updated_at: 2023-01-23 20:40:53.889949461 +02:00 :updated_by: maijanposteja@gmail.com - :id: 8 - :image_id: 103 -- :section_id: 54 + :id: 3 + :image_id: 27 +- :section_id: 10 :index: 1 :header: Music room :text: "The music rooms is equipped with\r\nacoustic and electric drum kits,\r\nguitar\r\nand @@ -75,9 +74,9 @@ button_text: '' :updated_at: 2023-01-24 19:33:55.418156724 +02:00 :updated_by: maijanposteja@gmail.com - :id: 9 - :image_id: 72 -- :section_id: 54 + :id: 4 + :image_id: 12 +- :section_id: 10 :index: 2 :header: Sauna :text: 'The Sauna is normally heated once a week. The workawayers take care (in @@ -93,9 +92,9 @@ button_text: '' :updated_at: 2023-01-24 19:40:22.858921574 +02:00 :updated_by: maijanposteja@gmail.com - :id: 10 - :image_id: 78 -- :section_id: 54 + :id: 5 + :image_id: 18 +- :section_id: 10 :index: 3 :header: Gym :text: "The gym offers\r\nparalets\r\npull-up bar\r\ntrx\r\nweights." @@ -109,9 +108,9 @@ button_text: '' :updated_at: 2023-01-24 19:34:11.451461440 +02:00 :updated_by: maijanposteja@gmail.com - :id: 11 - :image_id: 79 -- :section_id: 54 + :id: 6 + :image_id: 19 +- :section_id: 10 :index: 4 :header: Football field :text: There's a field right next to the Hub building, where you can play a sport @@ -126,9 +125,9 @@ button_text: '' :updated_at: 2023-01-23 20:55:37.315093887 +02:00 :updated_by: maijanposteja@gmail.com - :id: 12 - :image_id: 93 -- :section_id: 55 + :id: 7 + :image_id: 23 +- :section_id: 11 :index: 1 :header: The workaday deal :text: "Each workawayer is expected to work 5 hours per day, 5 days a week, when @@ -143,9 +142,9 @@ text_align: center :updated_at: 2023-01-25 16:29:21.847991197 +02:00 :updated_by: torsten@villataika.fi - :id: 13 - :image_id: 82 -- :section_id: 55 + :id: 8 + :image_id: 21 +- :section_id: 11 :index: 2 :header: Work types :text: "Some of the common work types include:\r\npainting, cleaning, cooking, renovating, @@ -159,9 +158,9 @@ text_align: center :updated_at: 2023-01-25 16:27:50.914346126 +02:00 :updated_by: torsten@villataika.fi - :id: 14 - :image_id: 81 -- :section_id: 55 + :id: 9 + :image_id: 20 +- :section_id: 11 :index: 3 :header: House rules :text: "Since we all live together, and create the safe and good-feeling space together, @@ -174,9 +173,9 @@ text_align: center :updated_at: 2023-01-24 20:35:46.674612328 +02:00 :updated_by: maijanposteja@gmail.com - :id: 15 - :image_id: 83 -- :section_id: 59 + :id: 10 + :image_id: 22 +- :section_id: 14 :index: 1 :header: Plane :text: "Helsinki-Vantaa airport is the closest one, from there you can take the @@ -191,9 +190,9 @@ button_text: '' :updated_at: 2023-01-23 22:07:00.003439376 +02:00 :updated_by: maijanposteja@gmail.com - :id: 16 - :image_id: 62 -- :section_id: 59 + :id: 11 + :image_id: 6 +- :section_id: 14 :index: 2 :header: Ferry :text: "You can take a ferry from Tallin/ Estonia, it takes around 2 hours and costs @@ -208,9 +207,9 @@ button_text: '' :updated_at: 2023-01-23 22:01:22.562193539 +02:00 :updated_by: maijanposteja@gmail.com - :id: 17 - :image_id: 64 -- :section_id: 59 + :id: 12 + :image_id: 8 +- :section_id: 14 :index: 3 :header: Train :text: "The train can be taken from Helsinki to Karjaa (Karis), takes about 1 hour. @@ -225,9 +224,9 @@ button_text: '' :updated_at: 2023-01-23 22:11:24.168748272 +02:00 :updated_by: maijanposteja@gmail.com - :id: 18 - :image_id: 63 -- :section_id: 60 + :id: 13 + :image_id: 7 +- :section_id: 15 :index: 1 :header: Explore nature :text: The Hub is surrounded by a beautiful forest, and a nearby lake. @@ -237,9 +236,9 @@ text_align: center :updated_at: 2023-01-23 23:49:14.675435045 +02:00 :updated_by: maijanposteja@gmail.com - :id: 19 - :image_id: 117 -- :section_id: 60 + :id: 14 + :image_id: 34 +- :section_id: 15 :index: 2 :header: Visit nearby bars :text: "bars include:\r\n\r\n**The Yard** in Karjaa\r\n**Rock'n'Roll Cafe** in @@ -250,9 +249,9 @@ text_align: center :updated_at: 2023-01-23 23:38:51.005331347 +02:00 :updated_by: maijanposteja@gmail.com - :id: 20 - :image_id: 69 -- :section_id: 60 + :id: 15 + :image_id: 9 +- :section_id: 15 :index: 3 :header: Visit Helsinki :text: 'The coastal capital of Finland has no shortage of tourist attractions and @@ -263,9 +262,9 @@ text_align: center :updated_at: 2023-01-23 23:37:32.682196925 +02:00 :updated_by: maijanposteja@gmail.com - :id: 21 - :image_id: 70 -- :section_id: 60 + :id: 16 + :image_id: 10 +- :section_id: 15 :index: 4 :header: In-house activities :text: There’s also lots of things happening in the house. For example yoga classes, @@ -276,9 +275,9 @@ text_align: center :updated_at: 2023-01-23 23:49:59.353172635 +02:00 :updated_by: maijanposteja@gmail.com - :id: 22 - :image_id: 19 -- :section_id: 51 + :id: 17 + :image_id: 2 +- :section_id: 7 :index: 1 :header: Swimming :text: 'Swimming in clean lakes There are several opertunities to go swimming. The @@ -290,9 +289,9 @@ text_align: center :updated_at: 2023-01-20 14:13:14.904435014 +02:00 :updated_by: torsten@villataika.fi - :id: 23 - :image_id: 76 -- :section_id: 51 + :id: 18 + :image_id: 16 +- :section_id: 7 :index: 2 :header: Fiskars & Billnäs Villages :text: 'The beautifully restored art and craft centre of Fiskars is just a 5 minutes @@ -304,9 +303,9 @@ text_align: center :updated_at: 2023-01-24 02:59:36.066057421 +02:00 :updated_by: maijanposteja@gmail.com - :id: 24 - :image_id: 75 -- :section_id: 51 + :id: 19 + :image_id: 15 +- :section_id: 7 :index: 3 :header: Hanko :text: 'Tammisaari and Hanko, old towns Tammisaari and Hanko are both beautiful @@ -318,9 +317,9 @@ text_align: center :updated_at: 2023-01-20 14:16:35.107520671 +02:00 :updated_by: torsten@villataika.fi - :id: 25 - :image_id: 74 -- :section_id: 51 + :id: 20 + :image_id: 14 +- :section_id: 7 :index: 4 :header: Raasepori Castle and Mustio :text: 'The old stone castle of Raasepori, now the namesake of the region is close @@ -332,9 +331,9 @@ text_align: center :updated_at: 2023-01-20 14:15:03.420353156 +02:00 :updated_by: torsten@villataika.fi - :id: 26 - :image_id: 73 -- :section_id: 51 + :id: 21 + :image_id: 13 +- :section_id: 7 :index: 5 :header: Walk or cycle through woods :text: 'There are many unpaved paths through the surrounding nature reseve. Bring @@ -345,14 +344,14 @@ text_align: center :updated_at: 2023-01-20 14:16:24.754169162 +02:00 :updated_by: torsten@villataika.fi - :id: 27 - :image_id: 77 -- :section_id: 53 + :id: 22 + :image_id: 17 +- :section_id: 9 :index: 1 :header: Kitchen + living room - :text: "Resident Artists have a dedicated corridor for themselves, where you share a kitchen - and living room space.\r\n\r\nMeals are often taken together, mostly depending - on how many cooks are available." + :text: "Resident Artists have a dedicated corridor for themselves, where you share + a kitchen and living room space.\r\n\r\nMeals are often taken together, mostly + depending on how many cooks are available." :options: background: none text_color: none @@ -363,9 +362,9 @@ button_text: '' :updated_at: 2023-01-25 16:47:41.820478507 +02:00 :updated_by: torsten@villataika.fi - :id: 28 - :image_id: 99 -- :section_id: 53 + :id: 23 + :image_id: 24 +- :section_id: 9 :index: 2 :header: Rooms etc :text: Accommodation is in shared rooms (2-4 persons), with shared showers & toilets, @@ -380,9 +379,9 @@ button_text: '' :updated_at: 2023-01-25 16:48:50.024949323 +02:00 :updated_by: torsten@villataika.fi - :id: 29 - :image_id: 100 -- :section_id: 46 + :id: 24 + :image_id: 25 +- :section_id: 6 :index: 2 :header: Eating :text: "The Hub provides ingredients and space, sometimes ready food from Events.\r\nShared @@ -398,9 +397,9 @@ button_text: '' :updated_at: 2023-01-25 16:52:24.078793636 +02:00 :updated_by: torsten@villataika.fi - :id: 30 - :image_id: 110 -- :section_id: 46 + :id: 25 + :image_id: 28 +- :section_id: 6 :index: 1 :header: Provided :text: "Whole of the Hub Feenix is a vegetarian area, so no other food is allowed @@ -416,9 +415,9 @@ button_text: '' :updated_at: 2023-01-25 16:51:05.320207298 +02:00 :updated_by: torsten@villataika.fi - :id: 31 - :image_id: 112 -- :section_id: 62 + :id: 26 + :image_id: 29 +- :section_id: 17 :index: 1 :header: '' :text: '' @@ -428,9 +427,9 @@ text_align: center :updated_at: 2023-01-24 04:06:11.552300013 +02:00 :updated_by: maijanposteja@gmail.com - :id: 34 - :image_id: 115 -- :section_id: 62 + :id: 27 + :image_id: 32 +- :section_id: 17 :index: 2 :header: '' :text: '' @@ -440,9 +439,9 @@ text_align: center :updated_at: 2023-01-23 22:42:22.022819565 +02:00 :updated_by: maijanposteja@gmail.com - :id: 35 - :image_id: 116 -- :section_id: 66 + :id: 28 + :image_id: 33 +- :section_id: 20 :index: 3 :header: Winter :text: "Winter is a long and dark, but also clear and beautiful.\r\nX-mas is darkest, @@ -457,9 +456,9 @@ 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 + :id: 29 + :image_id: 36 +- :section_id: 20 :index: 2 :header: Autumn :text: We make the most out of the autmn, enjoying the memory of warm, before it @@ -474,9 +473,9 @@ 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 + :id: 30 + :image_id: 37 +- :section_id: 20 :index: 4 :header: Spring :text: By the time spring comes, we have forgotten the last summer and are glad @@ -491,9 +490,9 @@ button_text: '' :updated_at: 2023-01-25 00:46:24.727773085 +02:00 :updated_by: torsten@villataika.fi - :id: 42 - :image_id: 124 -- :section_id: 66 + :id: 31 + :image_id: 38 +- :section_id: 20 :index: 1 :header: Summer :text: Summer is easy, but short and active. Beautiful, especially after the long @@ -508,9 +507,9 @@ button_text: '' :updated_at: 2023-01-25 00:47:43.929239825 +02:00 :updated_by: torsten@villataika.fi - :id: 43 - :image_id: 125 -- :section_id: 71 + :id: 32 + :image_id: 39 +- :section_id: 21 :index: 2 :header: Winter :text: "Usually there is varying amounts of snow from beginning of November to the @@ -527,9 +526,9 @@ button_text: Winter :updated_at: 2023-01-24 23:11:23.962046547 +02:00 :updated_by: torsten@villataika.fi - :id: 45 - :image_id: 127 -- :section_id: 71 + :id: 33 + :image_id: 40 +- :section_id: 21 :index: 1 :header: Summer :text: "Everybodu off course enjoys the summer, none more than the Fins (after a @@ -545,9 +544,9 @@ button_text: Summer :updated_at: 2023-01-25 00:56:33.466535830 +02:00 :updated_by: torsten@villataika.fi - :id: 47 - :image_id: 128 -- :section_id: 51 + :id: 34 + :image_id: 41 +- :section_id: 7 :index: 6 :header: Downhill skiing :text: Finland's most southest ski hill "Påminne" is only 10 mins from the Hub. @@ -557,9 +556,9 @@ text_align: center :updated_at: 2023-01-24 02:58:42.544009395 +02:00 :updated_by: maijanposteja@gmail.com - :id: 50 - :image_id: 118 -- :section_id: 51 + :id: 35 + :image_id: 35 +- :section_id: 7 :index: 7 :header: Horse riding :text: It's also possible to go riding in the forest with Hub's own horses (with @@ -570,9 +569,9 @@ text_align: center :updated_at: 2023-01-24 03:22:24.814964351 +02:00 :updated_by: maijanposteja@gmail.com - :id: 51 - :image_id: 135 -- :section_id: 72 + :id: 36 + :image_id: 43 +- :section_id: 22 :index: 1 :header: Coffee break! :text: '' @@ -582,9 +581,9 @@ text_align: center :updated_at: 2023-01-24 03:50:44.080515579 +02:00 :updated_by: maijanposteja@gmail.com - :id: 52 - :image_id: 137 -- :section_id: 72 + :id: 37 + :image_id: 44 +- :section_id: 22 :index: 3 :header: Testing the new freshly finished compost box... :text: '' @@ -594,9 +593,9 @@ text_align: center :updated_at: 2023-01-24 18:41:19.455569246 +02:00 :updated_by: maijanposteja@gmail.com - :id: 53 - :image_id: 114 -- :section_id: 72 + :id: 38 + :image_id: 31 +- :section_id: 22 :index: 2 :header: Just saying hello to Tähti ("Star") on a way to work. :text: '' @@ -606,9 +605,9 @@ text_align: center :updated_at: 2023-01-24 18:45:52.784842679 +02:00 :updated_by: maijanposteja@gmail.com - :id: 54 - :image_id: 138 -- :section_id: 74 + :id: 39 + :image_id: 45 +- :section_id: 24 :index: 1 :header: No bad weather :text: "In the nordics there is the saying that there is no bad weather, only bad @@ -621,9 +620,9 @@ order: left :updated_at: 2023-01-25 16:17:09.567801946 +02:00 :updated_by: torsten@villataika.fi - :id: 55 - :image_id: 142 -- :section_id: 74 + :id: 40 + :image_id: 49 +- :section_id: 24 :index: 2 :header: Layers :text: 'The way warm clothing is achieved is in Layers. Ideally wool against the @@ -636,9 +635,9 @@ order: left :updated_at: 2023-01-25 16:13:09.613378304 +02:00 :updated_by: torsten@villataika.fi - :id: 56 - :image_id: 141 -- :section_id: 74 + :id: 41 + :image_id: 48 +- :section_id: 24 :index: 3 :header: Enjoy It :text: "Really the only way to deal with the winter is to enjoy it.\r\n\r\nEven @@ -651,9 +650,9 @@ order: left :updated_at: 2023-01-25 16:21:00.514228895 +02:00 :updated_by: torsten@villataika.fi - :id: 57 - :image_id: 130 -- :section_id: 74 + :id: 42 + :image_id: 42 +- :section_id: 24 :index: 4 :header: Bright Light :text: "Winter is dark, it does down to 5 hours of daylight. Sometimes many days @@ -667,9 +666,9 @@ order: left :updated_at: 2023-01-25 16:19:44.253089186 +02:00 :updated_by: torsten@villataika.fi - :id: 58 - :image_id: 140 -- :section_id: 55 + :id: 43 + :image_id: 47 +- :section_id: 11 :index: 4 :header: Flexible Hours :text: "We try to be as flexible in the hours and tasks as can be. \r\nWhile off @@ -681,5 +680,5 @@ text_align: center :updated_at: 2023-01-25 16:26:20.115691707 +02:00 :updated_by: torsten@villataika.fi - :id: 59 - :image_id: 143 + :id: 44 + :image_id: 50 diff --git a/merged/images.yml b/merged/images.yml index 711338c..ebe4532 100644 --- a/merged/images.yml +++ b/merged/images.yml @@ -1,43 +1,19 @@ --- -- :name: 3dprinter - :type: webp - :width: 1279 - :height: 457 - :created_at: 2022-12-07 14:26:04.321730558 +02:00 - :size: 63 - :id: 2 - :tags: wide - :name: Cafe about :type: webp :width: 2698 :height: 839 :created_at: 2022-12-08 18:19:22.105516997 +02:00 :size: 216 - :id: 3 + :id: 1 :tags: '' -- :name: Coworking office - :type: webp - :width: 1740 - :height: 884 - :created_at: 2022-12-07 13:11:12.427371887 +02:00 - :size: 135 - :id: 9 - :tags: '' -- :name: Electronics - :type: webp - :width: 1279 - :height: 401 - :created_at: 2022-12-07 14:50:32.948094206 +02:00 - :size: 96 - :id: 12 - :tags: wide - :name: Loft :type: webp :width: 560 :height: 300 :created_at: 2022-12-06 14:04:08.148975654 +02:00 :size: 24 - :id: 19 + :id: 2 :tags: room - :name: Map :type: png @@ -45,20 +21,12 @@ :height: 1149 :created_at: 2022-12-08 18:56:09.781331767 +02:00 :size: 1020 - :id: 23 - :tags: wide -- :name: Woodworking - :type: webp - :width: 1279 - :height: 415 - :created_at: 2022-12-07 14:52:58.521569352 +02:00 - :size: 102 - :id: 42 + :id: 3 :tags: wide - :name: Feenix takaa :type: jpg :tags: '' - :id: 47 + :id: 4 :width: 826 :height: 619 :size: 199 @@ -70,7 +38,7 @@ :width: 2169 :height: 1149 :size: 1020 - :id: 61 + :id: 5 :updated_at: 2023-01-19 16:42:38.304752707 +02:00 :updated_by: solsolsola123@gmail.com - :name: plane @@ -79,7 +47,7 @@ :width: 512 :height: 512 :size: 31 - :id: 62 + :id: 6 :updated_at: 2023-01-19 16:52:39.404070353 +02:00 :updated_by: solsolsola123@gmail.com - :name: train @@ -88,7 +56,7 @@ :width: 512 :height: 512 :size: 14 - :id: 63 + :id: 7 :updated_at: 2023-01-19 16:52:45.188045847 +02:00 :updated_by: solsolsola123@gmail.com - :name: boat @@ -97,25 +65,16 @@ :width: 512 :height: 512 :size: 15 - :id: 64 + :id: 8 :updated_at: 2023-01-19 16:52:50.834897827 +02:00 :updated_by: solsolsola123@gmail.com -- :name: recycling - :type: png - :tags: '' - :width: 512 - :height: 512 - :size: 18 - :id: 65 - :updated_at: 2023-01-19 19:59:46.321553344 +02:00 - :updated_by: solsolsola123@gmail.com - :name: bar :type: jpg :tags: '' :width: 812 :height: 546 :size: 98 - :id: 69 + :id: 9 :updated_at: 2023-01-20 12:35:28.173507094 +02:00 :updated_by: solsolsola123@gmail.com - :name: suomi-helsinki-kauppatori-3-ss @@ -124,7 +83,7 @@ :width: 1220 :height: 799 :size: 705 - :id: 70 + :id: 10 :updated_at: 2023-01-20 12:47:10.622033529 +02:00 :updated_by: solsolsola123@gmail.com - :name: cars @@ -133,7 +92,7 @@ :width: 1600 :height: 900 :size: 197 - :id: 71 + :id: 11 :updated_at: 2023-01-20 13:29:23.598746936 +02:00 :updated_by: solsolsola123@gmail.com - :name: WhatsApp Image 2023-01-20 at 12 @@ -142,7 +101,7 @@ :width: 752 :height: 485 :size: 30 - :id: 72 + :id: 12 :updated_at: 2023-01-23 13:19:00.507151845 +02:00 :updated_by: torsten@villataika.fi - :name: raasepori @@ -151,7 +110,7 @@ :width: 600 :height: 406 :size: 63 - :id: 73 + :id: 13 :updated_at: 2023-01-20 14:15:18.564307797 +02:00 :updated_by: torsten@villataika.fi - :name: hanko @@ -160,7 +119,7 @@ :width: 800 :height: 600 :size: 280 - :id: 74 + :id: 14 :updated_at: 2023-01-20 14:11:15.913639567 +02:00 :updated_by: torsten@villataika.fi - :name: fiskars @@ -169,7 +128,7 @@ :width: 700 :height: 525 :size: 452 - :id: 75 + :id: 15 :updated_at: 2023-01-20 14:11:22.333790369 +02:00 :updated_by: torsten@villataika.fi - :name: swim @@ -178,7 +137,7 @@ :width: 607 :height: 450 :size: 138 - :id: 76 + :id: 16 :updated_at: 2023-01-20 14:11:29.612907456 +02:00 :updated_by: torsten@villataika.fi - :name: forest @@ -187,7 +146,7 @@ :width: 800 :height: 600 :size: 290 - :id: 77 + :id: 17 :updated_at: 2023-01-20 14:16:02.634842491 +02:00 :updated_by: torsten@villataika.fi - :name: WhatsApp Image 2023-01-20 at 14 @@ -196,7 +155,7 @@ :width: 894 :height: 612 :size: 53 - :id: 78 + :id: 18 :updated_at: 2023-01-23 13:19:57.377271897 +02:00 :updated_by: torsten@villataika.fi - :name: gym @@ -205,7 +164,7 @@ :width: 872 :height: 564 :size: 34 - :id: 79 + :id: 19 :updated_at: 2023-01-23 13:20:48.402571312 +02:00 :updated_by: torsten@villataika.fi - :name: paint-roller @@ -214,7 +173,7 @@ :width: 512 :height: 512 :size: 9 - :id: 81 + :id: 20 :updated_at: 2023-01-20 14:30:56.959501606 +02:00 :updated_by: solsolsola123@gmail.com - :name: engineer @@ -223,7 +182,7 @@ :width: 512 :height: 512 :size: 16 - :id: 82 + :id: 21 :updated_at: 2023-01-20 14:31:13.924243853 +02:00 :updated_by: solsolsola123@gmail.com - :name: referee @@ -232,7 +191,7 @@ :width: 512 :height: 512 :size: 15 - :id: 83 + :id: 22 :updated_at: 2023-01-20 14:32:17.058668657 +02:00 :updated_by: solsolsola123@gmail.com - :name: soccer-ball-on-field-260nw-40318078 @@ -241,7 +200,7 @@ :width: 390 :height: 257 :size: 23 - :id: 93 + :id: 23 :updated_at: 2023-01-23 13:18:15.206740959 +02:00 :updated_by: torsten@villataika.fi - :name: workaway keittiö @@ -250,7 +209,7 @@ :width: 622 :height: 622 :size: 216 - :id: 99 + :id: 24 :updated_at: 2023-01-25 16:48:30.133927084 +02:00 :updated_by: torsten@villataika.fi - :name: workaway room 2_copy @@ -259,7 +218,7 @@ :width: 1003 :height: 1119 :size: 304 - :id: 100 + :id: 25 :updated_at: 2023-01-23 19:38:54.078258568 +02:00 :updated_by: maijanposteja@gmail.com - :name: laundry room icon @@ -268,7 +227,7 @@ :width: 853 :height: 568 :size: 67 - :id: 102 + :id: 26 :updated_at: 2023-01-25 02:44:36.198422401 +02:00 :updated_by: torsten@villataika.fi - :name: workaway winter clothes @@ -277,7 +236,7 @@ :width: 1008 :height: 756 :size: 207 - :id: 103 + :id: 27 :updated_at: 2023-01-23 20:40:07.253442041 +02:00 :updated_by: maijanposteja@gmail.com - :name: workaway eating @@ -286,7 +245,7 @@ :width: 1021 :height: 764 :size: 104 - :id: 110 + :id: 28 :updated_at: 2023-01-23 21:26:56.422867033 +02:00 :updated_by: maijanposteja@gmail.com - :name: soup icon @@ -295,7 +254,7 @@ :width: 1280 :height: 1179 :size: 973 - :id: 112 + :id: 29 :updated_at: 2023-01-23 21:49:37.409515727 +02:00 :updated_by: maijanposteja@gmail.com - :name: girls by the lake @@ -304,7 +263,7 @@ :width: 1002 :height: 462 :size: 123 - :id: 113 + :id: 30 :updated_at: 2023-01-23 22:37:07.350628347 +02:00 :updated_by: maijanposteja@gmail.com - :name: in the compost box @@ -313,7 +272,7 @@ :width: 1001 :height: 751 :size: 93 - :id: 114 + :id: 31 :updated_at: 2023-01-23 22:38:33.292798302 +02:00 :updated_by: maijanposteja@gmail.com - :name: outdoors @@ -322,7 +281,7 @@ :width: 1009 :height: 673 :size: 220 - :id: 115 + :id: 32 :updated_at: 2023-01-24 23:21:09.128383841 +02:00 :updated_by: torsten@villataika.fi - :name: outdoors 2 @@ -331,7 +290,7 @@ :width: 1010 :height: 757 :size: 157 - :id: 116 + :id: 33 :updated_at: 2023-01-23 22:39:22.968764141 +02:00 :updated_by: maijanposteja@gmail.com - :name: winter forest @@ -340,7 +299,7 @@ :width: 4128 :height: 3096 :size: 4632 - :id: 117 + :id: 34 :updated_at: 2023-01-23 23:49:14.653302246 +02:00 :updated_by: maijanposteja@gmail.com - :name: paminne_laskijat @@ -349,25 +308,16 @@ :width: 1600 :height: 1067 :size: 459 - :id: 118 + :id: 35 :updated_at: 2023-01-24 00:41:57.155555943 +02:00 :updated_by: maijanposteja@gmail.com -- :name: irvin riding - :type: jpg - :tags: '' - :width: 1011 - :height: 759 - :size: 329 - :id: 120 - :updated_at: 2023-01-24 03:03:44.469272436 +02:00 - :updated_by: maijanposteja@gmail.com - :name: winter trees :type: jpg :tags: '' :width: 759 :height: 759 :size: 277 - :id: 122 + :id: 36 :updated_at: 2023-01-25 00:20:56.480521845 +02:00 :updated_by: torsten@villataika.fi - :name: autumn @@ -376,7 +326,7 @@ :width: 763 :height: 765 :size: 458 - :id: 123 + :id: 37 :updated_at: 2023-01-25 00:20:42.883663688 +02:00 :updated_by: torsten@villataika.fi - :name: spring @@ -385,7 +335,7 @@ :width: 765 :height: 765 :size: 325 - :id: 124 + :id: 38 :updated_at: 2023-01-25 00:21:03.899165279 +02:00 :updated_by: torsten@villataika.fi - :name: Lilac @@ -394,7 +344,7 @@ :width: 760 :height: 760 :size: 245 - :id: 125 + :id: 39 :updated_at: 2023-01-25 00:21:11.605158123 +02:00 :updated_by: torsten@villataika.fi - :name: northern lights @@ -403,7 +353,7 @@ :width: 1035 :height: 518 :size: 50 - :id: 127 + :id: 40 :updated_at: 2023-01-24 23:08:39.423738097 +02:00 :updated_by: torsten@villataika.fi - :name: summer lake @@ -412,61 +362,34 @@ :width: 1011 :height: 502 :size: 98 - :id: 128 + :id: 41 :updated_at: 2023-01-24 02:24:24.596791769 +02:00 :updated_by: maijanposteja@gmail.com -- :name: autumn outdoor - :type: jpg - :tags: '' - :width: 1006 - :height: 754 - :size: 196 - :id: 129 - :updated_at: 2023-01-24 02:24:59.621840469 +02:00 - :updated_by: maijanposteja@gmail.com - :name: winter swim :type: jpg :tags: '' :width: 776 :height: 776 :size: 77 - :id: 130 + :id: 42 :updated_at: 2023-01-25 15:49:00.714057850 +02:00 :updated_by: torsten@villataika.fi -- :name: spring building - :type: jpg - :tags: '' - :width: 1018 - :height: 763 - :size: 128 - :id: 131 - :updated_at: 2023-01-24 02:23:55.671820664 +02:00 - :updated_by: maijanposteja@gmail.com - :name: riding 2 :type: jpg :tags: '' :width: 1020 :height: 765 :size: 559 - :id: 135 + :id: 43 :updated_at: 2023-01-24 03:22:48.765630691 +02:00 :updated_by: maijanposteja@gmail.com -- :name: tea seremony - :type: jpg - :tags: '' - :width: 1536 - :height: 2048 - :size: 308 - :id: 136 - :updated_at: 2023-01-24 03:33:22.152518676 +02:00 - :updated_by: maijanposteja@gmail.com - :name: working :type: jpg :tags: '' :width: 1016 :height: 1583 :size: 354 - :id: 137 + :id: 44 :updated_at: 2023-01-24 03:39:35.294871904 +02:00 :updated_by: maijanposteja@gmail.com - :name: sheeo greeting @@ -475,7 +398,7 @@ :width: 673 :height: 1458 :size: 252 - :id: 138 + :id: 45 :updated_at: 2023-01-24 18:47:07.064175931 +02:00 :updated_by: maijanposteja@gmail.com - :name: winder wonderland @@ -484,7 +407,7 @@ :width: 4000 :height: 1800 :size: 6757 - :id: 139 + :id: 46 :updated_at: 2023-01-25 14:34:10.928748977 +02:00 :updated_by: torsten@villataika.fi - :name: kirkasvalo @@ -493,7 +416,7 @@ :width: 1017 :height: 1017 :size: 85 - :id: 140 + :id: 47 :updated_at: 2023-01-25 15:52:43.637189131 +02:00 :updated_by: torsten@villataika.fi - :name: layers @@ -502,7 +425,7 @@ :width: 1024 :height: 768 :size: 133 - :id: 141 + :id: 48 :updated_at: 2023-01-25 16:13:09.581329177 +02:00 :updated_by: torsten@villataika.fi - :name: coldman @@ -511,7 +434,7 @@ :width: 425 :height: 282 :size: 118 - :id: 142 + :id: 49 :updated_at: 2023-01-25 16:17:09.540473450 +02:00 :updated_by: torsten@villataika.fi - :name: flexiblee_hours @@ -520,6 +443,6 @@ :width: 207 :height: 197 :size: 2 - :id: 143 + :id: 50 :updated_at: 2023-01-25 16:24:43.990281723 +02:00 :updated_by: torsten@villataika.fi diff --git a/merged/pages.yml b/merged/pages.yml index 0a9c0fc..cad6547 100644 --- a/merged/pages.yml +++ b/merged/pages.yml @@ -1,57 +1,57 @@ --- - :name: about :updated_at: 2022-12-08 19:11:48.243621696 +02:00 - :id: 5 + :id: 1 :type: page :redirects: about3 about2 :options: {} - :name: index :updated_at: 2022-12-10 20:28:17.967357225 +02:00 - :id: 6 + :id: 2 :type: page - :name: living_here :updated_at: 2023-01-25 03:40:39.942007212 +02:00 :type: page :updated_by: torsten@villataika.fi - :id: 7 + :id: 3 :options: {} :redirects: info - :name: arriving :updated_at: 2023-01-12 14:02:14.590692012 +02:00 :type: page :updated_by: torsten@villataika.fi - :id: 8 + :id: 4 - :name: local_activities :updated_at: 2023-01-25 03:47:10.302999842 +02:00 :type: page :updated_by: torsten@villataika.fi - :id: 10 + :id: 5 :options: {} :redirects: local_area - :name: residency :updated_at: 2023-01-25 03:26:10.291551136 +02:00 :type: page :updated_by: torsten@villataika.fi - :id: 11 + :id: 6 :options: {} :redirects: what_to_expect workaway_deal - :name: four_seasons :updated_at: 2023-01-24 01:08:27.034924786 +02:00 :type: page :updated_by: maijanposteja@gmail.com - :id: 13 + :id: 7 - :name: in_summer :updated_at: 2023-01-24 22:44:37.221037641 +02:00 :type: page :updated_by: torsten@villataika.fi - :id: 14 + :id: 8 - :name: in_winter :updated_at: 2023-01-24 22:44:54.716492377 +02:00 :type: page :updated_by: torsten@villataika.fi - :id: 15 + :id: 9 - :name: helsinki_turku :updated_at: 2023-01-25 03:45:20.978053091 +02:00 :type: page :updated_by: torsten@villataika.fi - :id: 16 + :id: 10 diff --git a/merged/sections.yml b/merged/sections.yml index 98531dc..0b7302c 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -1,6 +1,6 @@ --- - :template: section_full_image - :id: 28 + :id: 1 :header: Hub Feenix :text: "Our Vision:\r\n\r\nArt, craft, music, yoga, dance, meditation, nature, and creatives of every kind come together under our roof in an atmosphere of openness @@ -15,12 +15,12 @@ image_align: right :image_name: cafe_about :updated_at: 2023-01-01 14:31:48.337456703 +02:00 - :page_id: 5 + :page_id: 1 :index: 1 - :image_id: 3 + :image_id: 1 :updated_by: torsten@villataika.fi - :template: section_full_up - :id: 29 + :id: 2 :header: About Us :text: "Hub Feenix is a community space that fosters creativity, healing, and connection. \r\nArt, craft, music, yoga, dance, meditation, nature, and creative people of @@ -40,11 +40,11 @@ text_align: center item_align: center :updated_at: 2022-12-08 19:11:48.243621696 +02:00 - :page_id: 5 + :page_id: 1 :index: 2 :image_id: - :template: section_full_image - :id: 30 + :id: 3 :header: The road to Feenix :text: "[Click here to open](https://duckduckgo.com/?t=ffab&q=H%C3%B6gbenintie+30%2C+10350+Meltola%2C+Raasepori&atb=v283-1&ia=web&iaxm=directions&end=what%3AH%25C3%25B6gbensv%25C3%25A4gen%252030%252C%252010350%2520Meltola%252C%2520Finland&transport=drive)" :image_name: map_wide @@ -56,16 +56,16 @@ item_align: left image_align: left :updated_at: 2023-01-01 14:19:06.708801219 +02:00 - :page_id: 5 + :page_id: 1 :index: 3 - :image_id: 23 + :image_id: 3 :updated_by: torsten@villataika.fi - :template: section_full_image :header: HUB FEENIX :text: Only an hour west of Helsinki, the Feenix rises from an old sanatorium. The Hub is a place to create, learn and regenerate. :image_name: house - :id: 31 + :id: 4 :options: fixed: 'on' shade_color: black_25 @@ -74,23 +74,23 @@ item_align: left image_align: center :updated_at: 2023-01-14 20:07:27.482852523 +02:00 - :page_id: 6 + :page_id: 2 :index: 1 - :image_id: 47 + :image_id: 4 :updated_by: maijanposteja@gmail.com - :template: section_large_image :index: 4 - :page_id: 5 + :page_id: 1 :updated_at: 2023-01-04 18:08:03.871868509 +02:00 :updated_by: maijanposteja@gmail.com - :id: 41 + :id: 5 :options: {} - :template: section_cards :index: 2 - :page_id: 7 + :page_id: 3 :updated_at: 2023-01-25 17:04:54.467275443 +02:00 :updated_by: torsten@villataika.fi - :id: 46 + :id: 6 :options: subheader: '' margin: large @@ -103,14 +103,14 @@ text_align: left :header: Food :text: "\r\n " - :image_id: 0 + :image_id: :card_template: card_wide_square - :template: section_cards :index: 1 - :page_id: 10 + :page_id: 5 :updated_at: 2023-01-20 14:12:29.789731694 +02:00 :updated_by: torsten@villataika.fi - :id: 51 + :id: 7 :options: background: white text_color: none @@ -127,7 +127,7 @@ :card_template: card_normal_round - :template: section_cards :index: 3 - :page_id: 7 + :page_id: 3 :header: Facilities :text: The Hub also provides extra facilities. We are in the country so eg a shared car is available. @@ -141,14 +141,14 @@ text_align: left :updated_at: 2023-01-25 17:04:40.052561299 +02:00 :updated_by: torsten@villataika.fi - :id: 52 + :id: 8 :card_template: card_normal_square - :template: section_cards :index: 1 - :page_id: 7 + :page_id: 3 :updated_at: 2023-01-25 17:04:51.625389248 +02:00 :updated_by: torsten@villataika.fi - :id: 53 + :id: 9 :options: subheader: '' margin: none @@ -163,14 +163,14 @@ :text: "Resident Artists live in their own shared community. There is usually between 6-12, rarely less or more.\r\nWhile you get to know many people this way, communal also requires everyone to participate (socially, cleaning etc)" - :image_id: 0 + :image_id: :card_template: card_wide_square - :template: section_cards :index: 4 - :page_id: 7 + :page_id: 3 :updated_at: 2023-01-25 16:56:12.118008081 +02:00 :updated_by: torsten@villataika.fi - :id: 54 + :id: 10 :card_template: card_normal_square :options: background: white @@ -182,10 +182,10 @@ :text: 'Also these are things you can use in and around the Hub. ' - :template: section_cards :index: 1 - :page_id: 11 + :page_id: 6 :updated_at: 2023-01-25 16:35:16.368295736 +02:00 :updated_by: torsten@villataika.fi - :id: 55 + :id: 11 :card_template: card_feature_normal :options: background: white @@ -202,10 +202,10 @@ (see below), we have a Video chat, using the secure [Signal App](https://www.signal.org/)" - :template: section_text :index: 3 - :page_id: 11 + :page_id: 6 :updated_at: 2023-01-24 20:18:33.284978612 +02:00 :updated_by: maijanposteja@gmail.com - :id: 56 + :id: 12 :options: text_columns: '4' background: white @@ -251,7 +251,7 @@ to ask, if you need help or information! There are no silly questions!\r\n" - :template: section_full_image :index: 2 - :page_id: 8 + :page_id: 4 :header: Here we are, bottom left :text: '' :options: @@ -267,14 +267,14 @@ button_text: '' :updated_at: 2023-01-25 16:41:17.767687999 +02:00 :updated_by: torsten@villataika.fi - :id: 58 - :image_id: 61 + :id: 13 + :image_id: 5 - :template: section_cards :index: 1 - :page_id: 8 + :page_id: 4 :updated_at: 2023-01-25 02:39:51.879367031 +02:00 :updated_by: torsten@villataika.fi - :id: 59 + :id: 14 :card_template: card_feature_normal :options: background: white @@ -288,10 +288,10 @@ maps](https://www.google.com/maps/place/Hub+Feenix/@60.1087256,23.7915169,17z/data=!3m1!4b1!4m5!3m4!1s0x468da5124a023e29:0xcae080e9021c7724!8m2!3d60.1087229!4d23.7937056)\r\n\r\n\r\n" - :template: section_cards :index: 1 - :page_id: 10 + :page_id: 5 :updated_at: 2023-01-25 03:30:27.757872017 +02:00 :updated_by: torsten@villataika.fi - :id: 60 + :id: 15 :card_template: card_full_image :options: background: white @@ -304,10 +304,10 @@ to do near the Hub, here are a few - ' - :template: section_text :index: 5 - :page_id: 7 + :page_id: 3 :updated_at: 2023-01-25 16:55:02.224622788 +02:00 :updated_by: torsten@villataika.fi - :id: 61 + :id: 16 :options: {} :header: Games & shared activities :text: "**Basement hide and seek** - The basement is structured like a maze which @@ -330,13 +330,13 @@ if you have any hobby or skill you would like to share with others. We've already had for example Japanese tea seremony, photographing, French bread baking, Jiujitsu, Yoga and so on..." - :image_id: 0 + :image_id: - :template: section_cards :index: 4 - :page_id: 8 + :page_id: 4 :updated_at: 2023-01-24 18:58:50.923978171 +02:00 :updated_by: maijanposteja@gmail.com - :id: 62 + :id: 17 :options: background: white columns: '2' @@ -348,10 +348,10 @@ :text: '' - :template: section_text :index: 2 - :page_id: 11 + :page_id: 6 :updated_at: 2023-01-24 18:40:22.072999842 +02:00 :updated_by: maijanposteja@gmail.com - :id: 63 + :id: 18 :card_template: '' :options: text_columns: 3 @@ -391,13 +391,13 @@ other loud noises must be avoided in the night time between 22-8 o’clock.\r\n" - :template: section_large_image :index: 3 - :page_id: 8 + :page_id: 4 :updated_at: 2023-01-23 23:32:17.915968380 +02:00 :updated_by: maijanposteja@gmail.com - :id: 64 + :id: 19 :card_template: '' :options: {} - :image_id: 113 + :image_id: 30 :header: What you should bring :text: "**Clothing** - it can get pretty cold during winter, so make sure to come with several layers of clothes, preferably woollen (we can also borrow you more). @@ -407,10 +407,10 @@ are** -with open mind and heart, ready to share and learn new!\r\n" - :template: section_cards :index: 1 - :page_id: 13 + :page_id: 7 :updated_at: 2023-01-25 00:12:12.444766597 +02:00 :updated_by: torsten@villataika.fi - :id: 66 + :id: 20 :card_template: card_normal_square :options: background: white @@ -428,10 +428,10 @@ means.\r\n" - :template: section_cards :index: 2 - :page_id: 13 + :page_id: 7 :updated_at: 2023-01-25 01:14:46.130313604 +02:00 :updated_by: torsten@villataika.fi - :id: 71 + :id: 21 :card_template: card_wide_square :options: background: white @@ -441,13 +441,13 @@ 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 + :image_id: - :template: section_cards :index: 4 - :page_id: 11 + :page_id: 6 :updated_at: 2023-01-25 16:42:41.264212352 +02:00 :updated_by: torsten@villataika.fi - :id: 72 + :id: 22 :card_template: card_full_image :options: background: white @@ -465,18 +465,18 @@ menu below" - :template: section_cards :index: 1 - :page_id: 14 + :page_id: 8 :updated_at: 2023-01-24 22:44:41.910577819 +02:00 :updated_by: torsten@villataika.fi - :id: 73 + :id: 23 :card_template: card_full_image :options: {} - :template: section_cards :index: 2 - :page_id: 15 + :page_id: 9 :updated_at: 2023-01-25 15:11:24.682559060 +02:00 :updated_by: torsten@villataika.fi - :id: 74 + :id: 24 :card_template: card_normal_square :options: background: white @@ -494,29 +494,29 @@ starts melting, green is coming and the race to summer begins." - :template: section_half_image :index: 2 - :page_id: 14 + :page_id: 8 :updated_at: 2023-01-24 23:25:19.322802742 +02:00 :updated_by: torsten@villataika.fi - :id: 75 + :id: 25 :card_template: '' :options: {} - :image_id: 115 + :image_id: 32 :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" - :template: section_full_up :index: 1 - :page_id: 16 + :page_id: 10 :updated_at: 2023-01-25 03:45:25.318340509 +02:00 :updated_by: torsten@villataika.fi - :id: 76 + :id: 26 :card_template: '' - :template: section_full_image :index: 1 - :page_id: 15 + :page_id: 9 :updated_at: 2023-01-25 14:35:30.093313267 +02:00 :updated_by: torsten@villataika.fi - :id: 77 + :id: 27 :card_template: '' :options: fixed: 'on' @@ -527,25 +527,25 @@ shade_color: none button_link: '' button_text: '' - :image_id: 139 + :image_id: 46 :header: Winter Wonderland :text: '' - :template: section_story :index: 2 - :page_id: 6 + :page_id: 2 :updated_at: 2023-01-28 15:05:55.208568115 +02:00 :updated_by: torsten@villataika.fi - :id: 78 + :id: 28 :card_template: '' :options: {} :header: Latest Story :text: '' - :template: section_pictures :index: 3 - :page_id: 6 + :page_id: 2 :updated_at: 2023-01-28 15:05:45.843146663 +02:00 :updated_by: torsten@villataika.fi - :id: 79 + :id: 29 :card_template: '' :options: {} :header: Latest Pictures