diff --git a/Gemfile.lock b/Gemfile.lock index 4d5e043..ed11499 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/HubFeenixMakers/merged - revision: 7a31f53835fcee4adefa42ddc44a1fad0e1a1772 + revision: c4da3d112c7d8a67dd8c2c5772bcadf193ff6731 specs: merged (0.1.0) active_hash @@ -261,7 +261,7 @@ GEM sanitize open4 (1.3.4) orm_adapter (0.5.0) - parser (3.1.3.0) + parser (3.2.0.0) ast (~> 2.4.1) passenger (6.0.15) rack diff --git a/app/assets/images/cms/43.webp b/app/assets/images/cms/43.webp new file mode 100644 index 0000000..3feb1f7 Binary files /dev/null and b/app/assets/images/cms/43.webp differ diff --git a/app/assets/images/cms/44.webp b/app/assets/images/cms/44.webp new file mode 100644 index 0000000..275d78b Binary files /dev/null and b/app/assets/images/cms/44.webp differ diff --git a/app/assets/images/cms/45.webp b/app/assets/images/cms/45.webp new file mode 100644 index 0000000..cda7709 Binary files /dev/null and b/app/assets/images/cms/45.webp differ diff --git a/merged/cards.yml b/merged/cards.yml index 3643423..57f7457 100644 --- a/merged/cards.yml +++ b/merged/cards.yml @@ -36,6 +36,7 @@ :section_id: 9 :index: 4 :image_id: + :options: {} - :id: 5 :header: Message :text: '' @@ -176,6 +177,7 @@ :section_id: 13 :index: 4 :image_id: + :options: {} - :id: 17 :header: Message :text: '' @@ -284,6 +286,7 @@ :section_id: 24 :index: 1 :image_id: + :options: {} - :id: 25 :header: Email :text: '' @@ -301,6 +304,7 @@ :section_id: 24 :index: 3 :image_id: + :options: {} - :id: 27 :header: Event Type :text: '' @@ -308,6 +312,7 @@ :section_id: 24 :index: 4 :image_id: + :options: {} - :id: 28 :header: Number of participants :text: '' @@ -315,6 +320,7 @@ :section_id: 24 :index: 5 :image_id: + :options: {} - :id: 29 :header: Date :text: '' @@ -522,3 +528,30 @@ :section_id: 40 :index: 5 :image_id: +- :section_id: 46 + :index: 1 + :header: Cozy coffee area + :text: We can serve you snacks with coffee right there. For food we also have a + dining area. + :options: + background: none + color: none + text_align: center + :updated_at: 2023-01-04 20:04:12.550687408 +02:00 + :updated_by: maijanposteja@gmail.com + :id: 47 + :image_id: 44 +- :section_id: 46 + :index: 2 + :header: Breakout rooms + :text: Two smaller breakout rooms make group work easy. We also have more rooms + available. + :options: + background: none + color: none + text_align: center + order: left + :updated_at: 2023-01-04 20:03:12.804727029 +02:00 + :updated_by: maijanposteja@gmail.com + :id: 48 + :image_id: 45 diff --git a/merged/images.yml b/merged/images.yml index 325a4e8..b791294 100644 --- a/merged/images.yml +++ b/merged/images.yml @@ -327,3 +327,30 @@ :size: 102 :id: 42 :tags: wide +- :name: sky conference + :type: webp + :tags: '' + :id: 43 + :width: 2306 + :height: 650 + :size: 977 + :updated_at: 2023-01-04 18:11:08.347725709 +02:00 + :updated_by: maijanposteja@gmail.com +- :name: sky cafe + :type: webp + :tags: '' + :id: 44 + :width: 577 + :height: 264 + :size: 20 + :updated_at: 2023-01-04 18:14:31.933624643 +02:00 + :updated_by: maijanposteja@gmail.com +- :name: sky breakout room + :type: webp + :tags: '' + :id: 45 + :width: 577 + :height: 264 + :size: 14 + :updated_at: 2023-01-04 18:15:49.797854998 +02:00 + :updated_by: maijanposteja@gmail.com diff --git a/merged/pages.yml b/merged/pages.yml index 4967bdf..e4dcb40 100644 --- a/merged/pages.yml +++ b/merged/pages.yml @@ -26,3 +26,8 @@ :updated_at: 2022-12-10 20:28:17.967357225 +02:00 :id: 6 :type: page +- :name: skyconference + :updated_at: 2023-01-04 18:20:47.734214099 +02:00 + :type: page + :updated_by: maijanposteja@gmail.com + :id: 7 diff --git a/merged/sections.yml b/merged/sections.yml index 8284111..abefb9b 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -298,11 +298,20 @@ :header: Accommodation :text: We have three wings set aside to accommodate retreat participants. Each wing can accommodate up to 32 people, and spare beds (and rooms) are available. - :updated_at: *2 + :updated_at: 2023-01-04 19:43:54.302020159 +02:00 :page_id: 3 :index: 3 :image_id: - :options: {} + :options: + background: white + color: solid_blue + margin: '0' + subheader: '' + text_align: center + item_align: center + button_link: '' + button_text: '' + :updated_by: maijanposteja@gmail.com - :template: section_full_image :id: 17 :image_name: suites_wide @@ -315,11 +324,11 @@ text_align: left item_align: left image_align: center - :updated_at: 2023-01-01 15:14:37.100014704 +02:00 + :updated_at: 2023-01-04 19:52:33.506057908 +02:00 :page_id: 3 :index: 4 :image_id: 39 - :updated_by: torsten@villataika.fi + :updated_by: maijanposteja@gmail.com - :template: section_full_image :id: 18 :header: Shared room @@ -367,10 +376,14 @@ button_link: '' button_text: '' margin: '0' - :updated_at: *2 + subheader: '' + text_align: center + item_align: center + :updated_at: 2023-01-04 19:47:16.145420982 +02:00 :page_id: 3 :index: 7 :image_id: + :updated_by: maijanposteja@gmail.com - :template: section_large_image :id: 21 :image_name: common_spaces_wide @@ -597,10 +610,11 @@ background: solid_blue :image_name: studios :id: 34 - :updated_at: *4 + :updated_at: 2023-01-04 18:50:12.038157205 +02:00 :page_id: 6 :index: 4 :image_id: 38 + :updated_by: markus.janhunen@iki.fi - :template: section_half_image :header: Makerspace :text: The hub encourages all people to be creative in any way they choose. We provide @@ -707,3 +721,62 @@ :page_id: 6 :index: 10 :image_id: +- :template: section_large_image + :index: 4 + :page_id: 5 + :updated_at: 2023-01-04 18:08:03.871868509 +02:00 + :updated_by: maijanposteja@gmail.com + :id: 41 + :options: {} +- :template: section_text + :index: 6 + :page_id: 5 + :updated_at: 2023-01-04 19:15:51.615405226 +02:00 + :updated_by: maijanposteja@gmail.com + :id: 43 + :options: + columns: '2' + background: white + color: none + margin: '0' + subheader: '' + :header: '' + :text: "## Our Story\r\n\r\n#### The birth of a community center \r\n\r\nRaisa Kaipainen + and Torsten Ruger bought the old Meltola hospital on the 27.4.2020 with the intent + to make it into a community centre. \r\n\r\nCurrently, the organisation is being + created to run the facility and plans are being actively developed. A great time + to join :-)" +- :template: section_full_image + :index: 1 + :page_id: 7 + :updated_at: 2023-01-04 18:36:36.420348213 +02:00 + :updated_by: maijanposteja@gmail.com + :id: 44 + :options: + fixed: 'off' + color: white + text_align: center + item_align: center + image_align: center + shade_color: none + :image_id: 43 + :header: Sky Conference + :text: "# Subheader\r\n\r\nHalf or full day, with or \r\nwithout food, see packages + below\r\n\r\n" +- :template: section_cards + :index: 3 + :page_id: 7 + :header: '' + :text: '' + :options: + color: black + text_align: center + item_align: center + image_align: center + shade_color: none + background: light_blue + columns: '2' + :updated_at: 2023-01-04 20:08:40.028774121 +02:00 + :updated_by: maijanposteja@gmail.com + :id: 46 + :card_template: card_wide_square