diff --git a/app/assets/images/merged/72.jpg b/app/assets/images/merged/72.jpg index 2cc09bc..dfeab2e 100644 Binary files a/app/assets/images/merged/72.jpg and b/app/assets/images/merged/72.jpg differ diff --git a/app/assets/images/merged/81.jpg b/app/assets/images/merged/81.jpg deleted file mode 100644 index 747c197..0000000 Binary files a/app/assets/images/merged/81.jpg and /dev/null differ diff --git a/app/assets/images/merged/82.jpg b/app/assets/images/merged/82.jpg deleted file mode 100644 index 1511256..0000000 Binary files a/app/assets/images/merged/82.jpg and /dev/null differ diff --git a/app/assets/images/merged/85.jpg b/app/assets/images/merged/85.jpg new file mode 100644 index 0000000..08cbaa1 Binary files /dev/null and b/app/assets/images/merged/85.jpg differ diff --git a/app/assets/images/merged/86.jpg b/app/assets/images/merged/86.jpg new file mode 100644 index 0000000..f62a90a Binary files /dev/null and b/app/assets/images/merged/86.jpg differ diff --git a/app/assets/images/merged/87.jpg b/app/assets/images/merged/87.jpg new file mode 100644 index 0000000..3a57889 Binary files /dev/null and b/app/assets/images/merged/87.jpg differ diff --git a/app/assets/images/merged/88.jpg b/app/assets/images/merged/88.jpg new file mode 100644 index 0000000..62c1f06 Binary files /dev/null and b/app/assets/images/merged/88.jpg differ diff --git a/app/assets/images/merged/89.jpg b/app/assets/images/merged/89.jpg new file mode 100644 index 0000000..c3a7aae Binary files /dev/null and b/app/assets/images/merged/89.jpg differ diff --git a/app/assets/images/merged/90.jpg b/app/assets/images/merged/90.jpg new file mode 100644 index 0000000..ef22362 Binary files /dev/null and b/app/assets/images/merged/90.jpg differ diff --git a/app/assets/images/merged/91.jpg b/app/assets/images/merged/91.jpg new file mode 100644 index 0000000..e0c7641 Binary files /dev/null and b/app/assets/images/merged/91.jpg differ diff --git a/app/assets/images/merged/93.jpg b/app/assets/images/merged/93.jpg new file mode 100644 index 0000000..93f2bda Binary files /dev/null and b/app/assets/images/merged/93.jpg differ diff --git a/merged/cards.yml b/merged/cards.yml index 538e65a..84103e1 100644 --- a/merged/cards.yml +++ b/merged/cards.yml @@ -683,10 +683,10 @@ text_color: none text_align: center order: left - :updated_at: 2023-02-12 00:46:46.506551965 +02:00 - :updated_by: torsten@villataika.fi + :updated_at: 2023-03-27 18:48:56.047595972 +03:00 + :updated_by: maijanposteja@gmail.com :id: 56 - :image_id: 53 + :image_id: 85 - :section_id: 50 :index: 3 :header: Cafe @@ -833,3 +833,89 @@ :updated_by: maijanposteja@gmail.com :id: 67 :image_id: 83 +- :section_id: 57 + :index: 1 + :header: '' + :text: '' + :options: + background: none + text_color: none + text_align: center + :updated_at: 2023-03-27 19:01:13.795108911 +03:00 + :updated_by: maijanposteja@gmail.com + :id: 68 + :image_id: 86 +- :section_id: 57 + :index: 3 + :header: '' + :text: '' + :options: + background: none + text_color: none + text_align: center + :updated_at: 2023-03-27 19:04:16.126360763 +03:00 + :updated_by: maijanposteja@gmail.com + :id: 69 + :image_id: 72 +- :section_id: 59 + :index: 1 + :header: '' + :text: '' + :options: + background: none + text_color: none + text_align: center + :updated_at: 2023-03-27 19:14:11.266282266 +03:00 + :updated_by: maijanposteja@gmail.com + :id: 70 + :image_id: 87 +- :section_id: 59 + :index: 2 + :header: '' + :text: '' + :options: + background: none + text_color: none + order: left + text_align: center + :updated_at: 2023-03-27 19:15:34.914389717 +03:00 + :updated_by: maijanposteja@gmail.com + :id: 71 + :image_id: 88 +- :section_id: 57 + :index: 2 + :header: '' + :text: '' + :options: + background: none + text_color: none + order: left + text_align: center + :updated_at: 2023-03-27 19:19:05.780540144 +03:00 + :updated_by: maijanposteja@gmail.com + :id: 72 + :image_id: 89 +- :section_id: 62 + :index: 1 + :header: '' + :text: '' + :options: + background: none + text_color: none + text_align: center + :updated_at: 2023-03-27 22:24:15.808196202 +03:00 + :updated_by: maijanposteja@gmail.com + :id: 73 + :image_id: 93 +- :section_id: 62 + :index: 2 + :header: '' + :text: '' + :options: + background: none + text_color: none + text_align: center + :updated_at: 2023-03-27 22:24:48.231218675 +03:00 + :updated_by: maijanposteja@gmail.com + :id: 74 + :image_id: 18 diff --git a/merged/images.yml b/merged/images.yml index e7e9403..fcb3b64 100644 --- a/merged/images.yml +++ b/merged/images.yml @@ -556,11 +556,11 @@ - :name: group :type: jpg :tags: '' - :width: 2400 - :height: 1600 - :size: 556 + :width: 986 + :height: 658 + :size: 167 :id: 72 - :updated_at: 2023-03-24 20:40:57.596901774 +02:00 + :updated_at: 2023-03-27 19:04:05.890719688 +03:00 :updated_by: maijanposteja@gmail.com - :name: wall painting :type: jpg @@ -634,24 +634,6 @@ :id: 80 :updated_at: 2023-03-27 18:11:43.536014448 +03:00 :updated_by: maijanposteja@gmail.com -- :name: 2b 2 - :type: jpg - :tags: '' - :width: 4128 - :height: 3096 - :size: 2544 - :id: 81 - :updated_at: 2023-03-27 18:07:41.472161922 +03:00 - :updated_by: maijanposteja@gmail.com -- :name: 2b 1 - :type: jpg - :tags: '' - :width: 982 - :height: 737 - :size: 318 - :id: 82 - :updated_at: 2023-03-27 18:10:24.569742722 +03:00 - :updated_by: maijanposteja@gmail.com - :name: 2a 1 :type: jpg :tags: '' @@ -670,3 +652,75 @@ :id: 84 :updated_at: 2023-03-27 18:34:16.494841779 +03:00 :updated_by: maijanposteja@gmail.com +- :name: co working kitchen + :type: jpg + :tags: '' + :width: 987 + :height: 740 + :size: 231 + :id: 85 + :updated_at: 2023-03-27 18:49:45.656599143 +03:00 + :updated_by: maijanposteja@gmail.com +- :name: DSC04470 + :type: jpg + :tags: '' + :width: 989 + :height: 659 + :size: 183 + :id: 86 + :updated_at: 2023-03-27 19:01:27.599508525 +03:00 + :updated_by: maijanposteja@gmail.com +- :name: hubfeenix_MiaJärvisalo-3 + :type: jpg + :tags: '' + :width: 984 + :height: 1475 + :size: 312 + :id: 87 + :updated_at: 2023-03-27 19:10:10.807586987 +03:00 + :updated_by: maijanposteja@gmail.com +- :name: hubfeenix_MiaJärvisalo-1 + :type: jpg + :tags: '' + :width: 984 + :height: 1475 + :size: 450 + :id: 88 + :updated_at: 2023-03-27 19:16:01.349873073 +03:00 + :updated_by: maijanposteja@gmail.com +- :name: hubfeenix_MiaJärvisalo-4 + :type: jpg + :tags: '' + :width: 992 + :height: 1312 + :size: 147 + :id: 89 + :updated_at: 2023-03-27 19:18:22.087134063 +03:00 + :updated_by: maijanposteja@gmail.com +- :name: hubfeenix_MiaJärvisalo-24 + :type: jpg + :tags: '' + :width: 2048 + :height: 1367 + :size: 619 + :id: 90 + :updated_at: 2023-03-27 19:21:35.483585526 +03:00 + :updated_by: maijanposteja@gmail.com +- :name: hubfeenix_MiaJärvisalo-26 + :type: jpg + :tags: '' + :width: 997 + :height: 666 + :size: 155 + :id: 91 + :updated_at: 2023-03-27 19:25:39.428779371 +03:00 + :updated_by: maijanposteja@gmail.com +- :name: The Loft edited + :type: jpg + :tags: '' + :width: 995 + :height: 543 + :size: 139 + :id: 93 + :updated_at: 2023-03-27 19:31:31.628259882 +03:00 + :updated_by: maijanposteja@gmail.com diff --git a/merged/pages.yml b/merged/pages.yml index de440ce..dac3c13 100644 --- a/merged/pages.yml +++ b/merged/pages.yml @@ -58,3 +58,23 @@ :type: page :updated_by: maijanposteja@gmail.com :id: 12 +- :name: mandala + :updated_at: 2023-03-27 18:51:37.000712075 +03:00 + :type: page + :updated_by: maijanposteja@gmail.com + :id: 13 +- :name: lootus + :updated_at: 2023-03-27 19:07:42.146032078 +03:00 + :type: page + :updated_by: maijanposteja@gmail.com + :id: 14 +- :name: earth_room + :updated_at: 2023-03-27 19:23:59.700316831 +03:00 + :type: page + :updated_by: maijanposteja@gmail.com + :id: 15 +- :name: the_loft + :updated_at: 2023-03-27 19:24:37.077399207 +03:00 + :type: page + :updated_by: maijanposteja@gmail.com + :id: 16 diff --git a/merged/sections.yml b/merged/sections.yml index 4adaa1d..f501c6f 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -1055,3 +1055,102 @@ text_align: left :header: Basic rooms :text: '' +- :template: section_large_image + :index: 1 + :page_id: 13 + :updated_at: 2023-03-27 19:02:33.835890138 +03:00 + :updated_by: maijanposteja@gmail.com + :id: 56 + :card_template: '' + :options: {} + :image_id: 64 + :header: Mandala + :text: '' +- :template: section_cards + :index: 2 + :page_id: 13 + :header: '' + :text: '' + :options: + margin: large + order: left + text_color: none + text_align: center + background: none + columns: '3' + subheader: '' + :updated_at: 2023-03-27 19:22:10.506987564 +03:00 + :updated_by: maijanposteja@gmail.com + :id: 57 + :card_template: card_gap_square + :image_id: 64 +- :template: section_large_image + :index: 1 + :page_id: 14 + :updated_at: 2023-03-27 22:20:30.677408854 +03:00 + :updated_by: maijanposteja@gmail.com + :id: 58 + :card_template: '' + :options: {} + :image_id: 56 + :header: Lootus room + :text: "Lootus room can also be rented by hour.\r\n" +- :template: section_cards + :index: 2 + :page_id: 14 + :header: '' + :text: '' + :options: + margin: large + order: left + text_color: none + text_align: center + background: none + columns: '2' + subheader: '' + :updated_at: 2023-03-27 19:13:22.759616496 +03:00 + :updated_by: maijanposteja@gmail.com + :id: 59 + :card_template: card_gap_square +- :template: section_large_image + :index: 1 + :page_id: 15 + :updated_at: 2023-03-27 19:24:22.917429907 +03:00 + :updated_by: maijanposteja@gmail.com + :id: 60 + :card_template: '' + :options: {} + :header: Earth Room + :text: '' +- :template: section_large_image + :index: 1 + :page_id: 16 + :updated_at: 2023-03-27 22:33:14.717932809 +03:00 + :updated_by: maijanposteja@gmail.com + :id: 61 + :card_template: '' + :options: {} + :header: The Loft + :text: The Loft has also a cozy spacious common area, handy kitchen corner, and + a possibility for some extra rooms if needed for more individual group work. + :image_id: 91 +- :template: section_cards + :index: 2 + :page_id: 16 + :header: '' + :text: '' + :options: + margin: large + order: right + text_color: none + text_align: center + background: none + subheader: '' + button_link: '' + button_text: '' + columns: '2' + :updated_at: 2023-03-27 22:25:55.799761024 +03:00 + :updated_by: maijanposteja@gmail.com + :id: 62 + :image_id: 0 + :card_template: card_normal_square