diff --git a/app/assets/images/merged/101.jpg b/app/assets/images/merged/101.jpg new file mode 100644 index 0000000..72208c3 Binary files /dev/null and b/app/assets/images/merged/101.jpg differ diff --git a/app/assets/images/merged/102.jpg b/app/assets/images/merged/102.jpg new file mode 100644 index 0000000..4b3cc91 Binary files /dev/null and b/app/assets/images/merged/102.jpg differ diff --git a/app/assets/images/merged/103.jpg b/app/assets/images/merged/103.jpg new file mode 100644 index 0000000..8f094f9 Binary files /dev/null and b/app/assets/images/merged/103.jpg differ diff --git a/app/assets/images/merged/104.png b/app/assets/images/merged/104.png new file mode 100644 index 0000000..5d708d9 Binary files /dev/null and b/app/assets/images/merged/104.png differ diff --git a/app/assets/images/merged/105.jpg b/app/assets/images/merged/105.jpg new file mode 100644 index 0000000..cb7c95b Binary files /dev/null and b/app/assets/images/merged/105.jpg differ diff --git a/app/assets/images/merged/106.jpg b/app/assets/images/merged/106.jpg new file mode 100644 index 0000000..0580fc0 Binary files /dev/null and b/app/assets/images/merged/106.jpg differ diff --git a/app/assets/images/merged/107.jpg b/app/assets/images/merged/107.jpg new file mode 100644 index 0000000..7855ac9 Binary files /dev/null and b/app/assets/images/merged/107.jpg differ diff --git a/app/assets/images/merged/108.jpg b/app/assets/images/merged/108.jpg new file mode 100644 index 0000000..38cd419 Binary files /dev/null and b/app/assets/images/merged/108.jpg differ diff --git a/app/assets/images/merged/109.jpg b/app/assets/images/merged/109.jpg new file mode 100644 index 0000000..bba0ba9 Binary files /dev/null and b/app/assets/images/merged/109.jpg differ diff --git a/app/assets/images/merged/110.jpg b/app/assets/images/merged/110.jpg new file mode 100644 index 0000000..df07e2a Binary files /dev/null and b/app/assets/images/merged/110.jpg differ diff --git a/app/assets/images/merged/111.jpg b/app/assets/images/merged/111.jpg new file mode 100644 index 0000000..e438bff Binary files /dev/null and b/app/assets/images/merged/111.jpg differ diff --git a/app/assets/images/merged/112.jpg b/app/assets/images/merged/112.jpg new file mode 100644 index 0000000..e7e3587 Binary files /dev/null and b/app/assets/images/merged/112.jpg differ diff --git a/app/assets/images/merged/113.jpg b/app/assets/images/merged/113.jpg new file mode 100644 index 0000000..16b6aed Binary files /dev/null and b/app/assets/images/merged/113.jpg differ diff --git a/merged/cards.yml b/merged/cards.yml index 3850c7d..3855447 100644 --- a/merged/cards.yml +++ b/merged/cards.yml @@ -1146,3 +1146,94 @@ :updated_by: hannaholma@gmail.com :id: 75 :image_id: 95 +- :section_id: 45 + :index: 1 + :header: Tempera + :text: "is in Punavuori, Helsinki, Uudenmaankatu 16.\r\nThe 500m2 store has the + widest selection of artist and drawing supplies in Finland. https://www.tempera.fi/" + :options: + background: light_blue + text_color: solid_black + order: left + text_align: center + subheader: '' + :updated_at: 2023-04-06 23:20:44.077012058 +03:00 + :updated_by: hannaholma@gmail.com + :id: 76 + :image_id: 107 +- :section_id: 45 + :index: 2 + :header: Konsta Shop + :text: "also sometimes called Manner, is a web shop that delivers quickly. They + have a large selection of printmaking and all other kinds of art supplies. \r\nhttps://konstashop.fi/" + :options: + background: light_blue + text_color: solid_black + order: left + text_align: center + subheader: '' + :updated_at: 2023-04-06 23:32:58.854946826 +03:00 + :updated_by: hannaholma@gmail.com + :id: 77 + :image_id: 104 +- :section_id: 45 + :index: 3 + :header: Diverse + :text: is a tiny art supply shop almost opposite to Tempera, Uudenmaankatu 11, Helsinki. + They have a special selection of colours and papers, and enthusiastic and sympathetic + service. https://www.diverse.fi/en/ + :options: + background: light_blue + text_color: solid_black + order: left + text_align: center + subheader: '' + :updated_at: 2023-04-06 23:31:06.387909060 +03:00 + :updated_by: hannaholma@gmail.com + :id: 78 + :image_id: 108 +- :section_id: 45 + :index: 4 + :header: Arteljee + :text: "has two art supply stores, one in Helsinki, Lönnrotinkatu 23 and one in + Tampere, Hallituskatu 11, and a webshop. \r\nhttps://arteljee.fi/" + :options: + background: light_blue + text_color: solid_black + order: left + text_align: center + subheader: '' + :updated_at: 2023-04-06 23:46:03.073265299 +03:00 + :updated_by: hannaholma@gmail.com + :id: 79 + :image_id: 109 +- :section_id: 45 + :index: 5 + :header: Art Shop + :text: is a webshop that has wide selection and sometimes very nice offers. They + also deliver extremely quickly. https://www.artshop.fi/ + :options: + background: light_blue + text_color: solid_black + order: left + text_align: center + subheader: '' + :updated_at: 2023-04-06 23:53:20.531858229 +03:00 + :updated_by: hannaholma@gmail.com + :id: 80 + :image_id: 110 +- :section_id: 45 + :index: 6 + :header: Finnish Painters´ Union + :text: "has an art supply store for painters at their gallery in Erottajankatu 9 + B, Helsinki. \r\nhttps://www.painters.fi/en/art-materials-supplies/" + :options: + background: light_blue + text_color: solid_black + order: left + text_align: center + subheader: '' + :updated_at: 2023-04-07 00:11:54.737036945 +03:00 + :updated_by: hannaholma@gmail.com + :id: 81 + :image_id: 112 diff --git a/merged/images.yml b/merged/images.yml index 0fcf1e7..7f6b30d 100644 --- a/merged/images.yml +++ b/merged/images.yml @@ -896,3 +896,120 @@ :id: 100 :updated_at: 2023-03-26 13:15:49.043157613 +03:00 :updated_by: hannaholma@gmail.com +- :name: hubfeenix_MiaJärvisalo-20 + :type: jpg + :tags: '' + :width: 2048 + :height: 1367 + :size: 666 + :id: 101 + :updated_at: 2023-04-01 23:27:23.863452989 +03:00 + :updated_by: hannaholma@gmail.com +- :name: Tempera + :type: jpg + :tags: '' + :width: 540 + :height: 405 + :size: 45 + :id: 102 + :updated_at: 2023-04-06 22:23:40.484273727 +03:00 + :updated_by: hannaholma@gmail.com +- :name: liidut + :type: jpg + :tags: '' + :width: 348 + :height: 126 + :size: 8 + :id: 103 + :updated_at: 2023-04-06 22:29:31.230520120 +03:00 + :updated_by: hannaholma@gmail.com +- :name: Konsta Shop + :type: png + :tags: '' + :width: 601 + :height: 579 + :size: 48 + :id: 104 + :updated_at: 2023-04-06 23:06:50.545846129 +03:00 + :updated_by: hannaholma@gmail.com +- :name: templogoilmantausta pieni_000 + :type: jpg + :tags: '' + :width: 224 + :height: 44 + :size: 4 + :id: 105 + :updated_at: 2023-04-06 23:14:53.216575093 +03:00 + :updated_by: hannaholma@gmail.com +- :name: tempera rajattu + :type: jpg + :tags: '' + :width: 244 + :height: 344 + :size: 19 + :id: 106 + :updated_at: 2023-04-06 23:17:57.795961171 +03:00 + :updated_by: hannaholma@gmail.com +- :name: tempera väh rajattu + :type: jpg + :tags: '' + :width: 317 + :height: 404 + :size: 29 + :id: 107 + :updated_at: 2023-04-06 23:20:44.037979717 +03:00 + :updated_by: hannaholma@gmail.com +- :name: diverse + :type: jpg + :tags: '' + :width: 316 + :height: 474 + :size: 36 + :id: 108 + :updated_at: 2023-04-06 23:27:51.934307283 +03:00 + :updated_by: hannaholma@gmail.com +- :name: arteljee + :type: jpg + :tags: '' + :width: 967 + :height: 1076 + :size: 212 + :id: 109 + :updated_at: 2023-04-06 23:38:30.010807366 +03:00 + :updated_by: hannaholma@gmail.com +- :name: kalligrafiasivellin_S_M_L + :type: jpg + :tags: '' + :width: 478 + :height: 564 + :size: 33 + :id: 110 + :updated_at: 2023-04-06 23:52:56.753767728 +03:00 + :updated_by: hannaholma@gmail.com +- :name: tarvikevalitys_uusi-300x200 + :type: jpg + :tags: '' + :width: 144 + :height: 180 + :size: 10 + :id: 111 + :updated_at: 2023-04-06 23:58:24.500222172 +03:00 + :updated_by: hannaholma@gmail.com +- :name: tarvike_etusivu-1 + :type: jpg + :tags: '' + :width: 435 + :height: 528 + :size: 91 + :id: 112 + :updated_at: 2023-04-07 00:05:31.328584349 +03:00 + :updated_by: hannaholma@gmail.com +- :name: hubfeenix_MiaJärvisalo-22 + :type: jpg + :tags: '' + :width: 2048 + :height: 1096 + :size: 459 + :id: 113 + :updated_at: 2023-04-07 00:23:25.649795493 +03:00 + :updated_by: hannaholma@gmail.com diff --git a/merged/pages.yml b/merged/pages.yml index 663afef..7fc7ff5 100644 --- a/merged/pages.yml +++ b/merged/pages.yml @@ -62,3 +62,29 @@ :type: page :updated_by: hannaholma@gmail.com :id: 11 +- :name: code_of_conduct + :updated_at: 2023-04-01 23:12:42.318280741 +03:00 + :type: page + :updated_by: hannaholma@gmail.com + :id: 12 +- :name: practical_information + :updated_at: 2023-04-01 23:13:12.425408037 +03:00 + :type: page + :updated_by: hannaholma@gmail.com + :id: 13 + :options: {} +- :name: how_to_apply + :updated_at: 2023-04-01 23:16:50.841207679 +03:00 + :type: page + :updated_by: hannaholma@gmail.com + :id: 14 +- :name: art_supply_stores + :updated_at: 2023-04-06 22:01:09.071876352 +03:00 + :type: page + :updated_by: hannaholma@gmail.com + :id: 15 +- :name: accessibility + :updated_at: 2023-04-07 00:46:34.951182394 +03:00 + :type: page + :updated_by: hannaholma@gmail.com + :id: 16 diff --git a/merged/sections.yml b/merged/sections.yml index 41bd8da..6485270 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -62,10 +62,8 @@ :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. \r\n\r\nHub Feenix Residency - welcomes both Finnish and international artists to live and work in an inspiring - environment in the middle of nature. " + :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: 4 :options: @@ -75,7 +73,9 @@ text_align: center item_align: left image_align: center - :updated_at: 2023-03-26 17:35:30.365470441 +03:00 + button_link: '' + button_text: '' + :updated_at: 2023-04-07 00:32:07.404414335 +03:00 :page_id: 2 :index: 1 :image_id: 4 @@ -341,8 +341,8 @@ :text: '' - :template: section_half_image :index: 7 - :page_id: 6 - :updated_at: 2023-03-26 00:50:59.292951043 +02:00 + :page_id: 12 + :updated_at: 2023-04-01 23:15:08.392668657 +03:00 :updated_by: hannaholma@gmail.com :id: 18 :card_template: '' @@ -439,8 +439,8 @@ :image_id: - :template: section_half_image :index: 9 - :page_id: 6 - :updated_at: 2023-03-26 00:09:43.218572456 +02:00 + :page_id: 14 + :updated_at: 2023-04-01 23:17:30.504114537 +03:00 :updated_by: hannaholma@gmail.com :id: 22 :card_template: '' @@ -551,7 +551,7 @@ :header: Winter Wonderland :text: '' - :template: section_story - :index: 2 + :index: 3 :page_id: 2 :updated_at: 2023-01-28 15:05:55.208568115 +02:00 :updated_by: torsten@villataika.fi @@ -561,7 +561,7 @@ :header: Latest Story :text: '' - :template: section_pictures - :index: 3 + :index: 4 :page_id: 2 :updated_at: 2023-01-28 15:05:45.843146663 +02:00 :updated_by: torsten@villataika.fi @@ -675,8 +675,8 @@ new me.\"" - :template: section_full_image :index: 5 - :page_id: 6 - :updated_at: 2023-03-26 12:56:12.885080476 +03:00 + :page_id: 11 + :updated_at: 2023-04-01 23:14:39.545660125 +03:00 :updated_by: hannaholma@gmail.com :id: 35 :card_template: '' @@ -700,7 +700,7 @@ :image_id: 89 - :template: section_cards :index: 6 - :page_id: 6 + :page_id: 11 :header: '' :text: '' :options: @@ -712,7 +712,7 @@ background: none columns: '5' subheader: '' - :updated_at: 2023-03-25 23:35:46.085468747 +02:00 + :updated_at: 2023-04-01 23:18:10.878456487 +03:00 :updated_by: hannaholma@gmail.com :id: 36 :card_template: card_normal_square @@ -731,9 +731,9 @@ text_color: white text_align: left - :template: section_full_image - :index: 4 - :page_id: 6 - :updated_at: 2023-03-26 12:51:34.917635089 +03:00 + :index: 3 + :page_id: 13 + :updated_at: 2023-04-01 23:36:09.732685779 +03:00 :updated_by: hannaholma@gmail.com :id: 38 :card_template: '' @@ -758,3 +758,129 @@ :updated_at: 2023-03-26 18:02:34.643530554 +03:00 :updated_by: hannaholma@gmail.com :id: 39 + :options: {} +- :template: section_spacer + :index: 1 + :page_id: 12 + :updated_at: 2023-04-01 23:12:42.352483101 +03:00 + :updated_by: hannaholma@gmail.com + :id: 40 + :options: {} +- :template: section_spacer + :index: 1 + :page_id: 13 + :updated_at: 2023-04-01 23:13:12.457265387 +03:00 + :updated_by: hannaholma@gmail.com + :id: 41 + :options: {} +- :template: section_spacer + :index: 1 + :page_id: 14 + :updated_at: 2023-04-01 23:16:50.869557232 +03:00 + :updated_by: hannaholma@gmail.com + :id: 42 + :options: {} +- :template: section_half_image + :index: 4 + :page_id: 13 + :header: Who can apply? + :text: "- Visual artists, craftmakers, musicians, writers, journalists, curators, + critics \r\n" + :options: + text_color: solid_black + text_align: center + item_align: center + image_align: center + shade_color: none + order: left + background: light_gray + subheader: '' + button_link: '' + button_text: '' + :updated_at: 2023-04-01 23:29:40.158986770 +03:00 + :updated_by: hannaholma@gmail.com + :id: 43 + :card_template: '' + :image_id: 101 +- :template: section_full_image + :index: 1 + :page_id: 15 + :updated_at: 2023-04-06 22:30:41.135115248 +03:00 + :updated_by: hannaholma@gmail.com + :id: 44 + :card_template: '' + :options: + background: light_blue + columns: '1' + subheader: '' + text_color: white + text_align: center + fixed: 'off' + item_align: center + image_align: left-top + shade_color: white_25 + button_link: '' + button_text: '' + :header: 'Where to buy art supplies? ' + :text: The nearest art supply stores are in Helsinki. But if you can't make it to + Helsinki, there are several art supplies online stores in Finland that deliver + the products quickly, sometimes even within a day. + :image_id: 103 +- :template: section_cards + :index: 2 + :page_id: 15 + :updated_at: 2023-04-07 00:19:23.577439716 +03:00 + :updated_by: hannaholma@gmail.com + :id: 45 + :card_template: card_gap_square + :options: + background: none + columns: '3' + subheader: '' + text_color: solid_black + text_align: center + :image_id: 0 + :header: Art supply stores in Helsinki + :text: "... and some web shops too:" +- :template: section_full_image + :index: 2 + :page_id: 2 + :updated_at: 2023-04-07 00:39:11.913782270 +03:00 + :updated_by: hannaholma@gmail.com + :id: 46 + :card_template: '' + :options: + fixed: 'off' + text_color: white + text_align: center + item_align: right + image_align: left-top + shade_color: black_25 + button_link: '' + button_text: '' + :image_id: 101 + :header: Artist Residency + :text: "We welcome both Finnish and international artists to live and work in an + inspiring environment in the middle of nature. \r\n\r\nVisual artists, arts and + crafts makers, writers, journalists, musicians etc are welcome to apply for a + 1-3 months residency." +- :template: section_full_image + :index: 1 + :page_id: 16 + :updated_at: 2023-04-07 00:49:21.293718515 +03:00 + :updated_by: hannaholma@gmail.com + :id: 47 + :card_template: '' + :options: + fixed: 'off' + text_color: white + text_align: center + item_align: center + image_align: left-top + shade_color: black_25 + button_link: '' + button_text: '' + :image_id: 113 + :header: Accessibility + :text: 'The building is an old sanatorium. It has also served as a hospital. That´s + why most of the spaces are wheelchair accessible. '