diff --git a/app/assets/images/cms/55.jpeg b/app/assets/images/cms/55.jpeg index 0155d84..cf42a3f 100644 Binary files a/app/assets/images/cms/55.jpeg and b/app/assets/images/cms/55.jpeg differ diff --git a/app/assets/images/cms/56.jpeg b/app/assets/images/cms/56.jpeg index 1851873..1c0f871 100644 Binary files a/app/assets/images/cms/56.jpeg and b/app/assets/images/cms/56.jpeg differ diff --git a/app/assets/images/cms/57.jpeg b/app/assets/images/cms/57.jpeg new file mode 100644 index 0000000..6d56b47 Binary files /dev/null and b/app/assets/images/cms/57.jpeg differ diff --git a/app/assets/images/cms/58.jpeg b/app/assets/images/cms/58.jpeg new file mode 100644 index 0000000..48b30b4 Binary files /dev/null and b/app/assets/images/cms/58.jpeg differ diff --git a/app/assets/images/cms/59.jpeg b/app/assets/images/cms/59.jpeg new file mode 100644 index 0000000..05879a5 Binary files /dev/null and b/app/assets/images/cms/59.jpeg differ diff --git a/app/assets/images/cms/60.jpeg b/app/assets/images/cms/60.jpeg new file mode 100644 index 0000000..9705f12 Binary files /dev/null and b/app/assets/images/cms/60.jpeg differ diff --git a/merged/cards.yml b/merged/cards.yml index e3fe7a4..d254f8d 100644 --- a/merged/cards.yml +++ b/merged/cards.yml @@ -7,65 +7,184 @@ background: light_blue text_color: solid_black text_align: center - button_link: "/transportation" + button_link: info/Accomodation button_text: Transportation - :updated_at: 2023-01-18 16:03:41.752621578 +02:00 + :updated_at: 2023-01-19 12:13:26.801609135 +02:00 :updated_by: solsolsola123@gmail.com :id: 1 :image_id: 49 - :section_id: 44 :index: 2 - :header: Food - :text: "beans\r\ntofu\r\nbeans\r\ntofu\r\nbeans\r\ntofu\r\nbeans\r\ntofu\r\nbeans\r\ntofu\r\n" + :header: '' + :text: '' :options: background: solid_blue text_color: solid_blue text_align: center - button_link: '' - button_text: '' - :updated_at: 2023-01-18 13:48:45.089449230 +02:00 + button_link: "/food" + button_text: Food + :updated_at: 2023-01-19 12:05:08.721307480 +02:00 :updated_by: solsolsola123@gmail.com :id: 2 :image_id: 48 - :section_id: 44 :index: 3 - :header: utilities - :text: "washing machine\r\nshower\r\ncommon kitchen\r\nbathrooms" + :header: '' + :text: '' :options: background: solid_indigo text_color: solid_black text_align: center - button_link: '' - button_text: '' - :updated_at: 2023-01-18 13:49:51.357574298 +02:00 + button_link: "/utilities" + button_text: utilities + :updated_at: 2023-01-19 12:05:27.829714024 +02:00 :updated_by: solsolsola123@gmail.com :id: 3 :image_id: 50 - :section_id: 44 :index: 4 - :header: Facilities - :text: "music room \r\nsauna\r\ncomputer room\r\ngym\r\n" + :header: '' + :text: "\r\n" :options: background: solid_blue text_color: solid_blue text_align: center - button_link: '' - button_text: '' - :updated_at: 2023-01-18 13:50:55.799490416 +02:00 + button_link: "/Facilities" + button_text: Facilities + :updated_at: 2023-01-19 12:06:01.003811448 +02:00 :updated_by: solsolsola123@gmail.com :id: 4 :image_id: 51 - :section_id: 44 :index: 5 - :header: Clothing - :text: "clothing room\r\nwork clothes\r\nfunny hats\r\nlarge socks\r\n" + :header: '' + :text: '' :options: background: light_blue text_color: solid_black text_align: center - button_link: '' - button_text: '' - :updated_at: 2023-01-18 13:52:32.303724776 +02:00 + button_link: "/Clothing" + button_text: Clothing + :updated_at: 2023-01-19 12:06:39.849284242 +02:00 :updated_by: solsolsola123@gmail.com :id: 5 :image_id: 52 +- :section_id: 52 + :index: 1 + :header: Transportation + :text: "- **Car** - The hub provides a volunteer car at cost price. \r\n- **Bus** + - a bus arrives to the hub twice a day [see here](https://www.matkahuolto.fi/en).\r\n- + **Bicycle** - free bycicle for everyday use.\r\n- **Train** - the nearby train + station is perfect for longer travels, one hour to Helsinki, [see more](https://www.vr.fi/en).\r\n" + :options: + background: light_orange + text_color: none + text_align: left + order: left + subheader: '' + button_link: '' + button_text: '' + :updated_at: 2023-01-19 15:24:24.830407450 +02:00 + :updated_by: solsolsola123@gmail.com + :id: 6 + :image_id: 55 +- :section_id: 52 + :index: 2 + :header: common utilities + :text: "- **Washing machine** \r\n- **kitchen** - common kitchen and lounge space\r\n- + **storage** - individual shelves for dry/ non refrigirated food\r\n- **Showers** + \r\n" + :options: + background: light_blue + text_color: none + text_align: left + order: left + subheader: '' + button_link: '' + button_text: '' + :updated_at: 2023-01-19 15:25:37.738326293 +02:00 + :updated_by: solsolsola123@gmail.com + :id: 7 + :image_id: 56 +- :section_id: 52 + :index: 3 + :header: clothing + :text: "##Our common clothing room offers:\r\n\r\n• shirts\r\n• pants\r\n• sweatshirts\r\n• + sweaters\r\n• shoes\r\n• work clothes\r\n• coats\r\n• scarves\r\n• hats\r\n• gloves\r\n• + sock\r\n• robes\r\n" + :options: + background: light_gray + text_color: none + text_align: left + order: left + subheader: '' + button_link: '' + button_text: '' + :updated_at: 2023-01-19 15:26:44.362100245 +02:00 + :updated_by: solsolsola123@gmail.com + :id: 8 + :image_id: 57 +- :section_id: 54 + :index: 1 + :header: music room + :text: "the music rooms is equipped with - \r\nacoustic and electric drum kits,\r\nguitar\r\nand + piano" + :options: + background: light_blue + text_color: none + text_align: center + subheader: '' + order: left + button_link: '' + button_text: '' + :updated_at: 2023-01-19 15:45:04.371033456 +02:00 + :updated_by: solsolsola123@gmail.com + :id: 9 + :image_id: 51 +- :section_id: 54 + :index: 2 + :header: sauna + :text: "the sauna is open at least once a week.\r\nsometimes during summer the sauna + is moved to the lake. " + :options: + background: light_gray + text_color: none + text_align: center + order: left + subheader: '' + button_link: '' + button_text: '' + :updated_at: 2023-01-19 15:45:09.180623548 +02:00 + :updated_by: solsolsola123@gmail.com + :id: 10 + :image_id: 59 +- :section_id: 54 + :index: 3 + :header: gym + :text: "the gym offers\r\nparalets\r\npull-up bar\r\ntrx\r\nweights" + :options: + background: light_orange + text_color: none + text_align: center + order: left + subheader: '' + button_link: '' + button_text: '' + :updated_at: 2023-01-19 15:51:14.531746232 +02:00 + :updated_by: solsolsola123@gmail.com + :id: 11 + :image_id: 59 +- :section_id: 54 + :index: 4 + :header: Football field + :text: the Field right near the hub building, where you can play a sport of your + choice. + :options: + background: none + text_color: none + text_align: center + order: left + :updated_at: 2023-01-19 15:56:47.741955010 +02:00 + :updated_by: solsolsola123@gmail.com + :id: 12 + :image_id: 60 diff --git a/merged/images.yml b/merged/images.yml index 9b84b6e..d945653 100644 --- a/merged/images.yml +++ b/merged/images.yml @@ -401,7 +401,7 @@ :height: 512 :size: 14 :id: 51 - :updated_at: 2023-01-18 13:18:32.519484413 +02:00 + :updated_at: 2023-01-19 15:47:06.915969272 +02:00 :updated_by: solsolsola123@gmail.com - :name: winter-jacket :type: png @@ -433,18 +433,54 @@ - :name: Transportation hero :type: jpeg :tags: '' - :width: 920 - :height: 500 - :size: 146 + :width: 753 + :height: 410 + :size: 116 :id: 55 - :updated_at: 2023-01-18 15:45:03.005405974 +02:00 - :updated_by: solsolsola123@gmail.com -- :name: photo_2019-05-17_15-23-56 + :updated_at: 2023-01-19 14:13:24.910074923 +02:00 + :updated_by: torsten@villataika.fi +- :name: washing :type: jpeg :tags: '' - :width: 1280 - :height: 854 - :size: 143 + :width: 753 + :height: 502 + :size: 48 :id: 56 - :updated_at: 2023-01-18 15:53:56.866447668 +02:00 + :updated_at: 2023-01-19 14:13:08.017584900 +02:00 + :updated_by: torsten@villataika.fi +- :name: clothes + :type: jpeg + :tags: '' + :width: 695 + :height: 452 + :size: 64 + :id: 57 + :updated_at: 2023-01-19 14:12:36.951390617 +02:00 + :updated_by: torsten@villataika.fi +- :name: bedroom + :type: jpeg + :tags: '' + :width: 2545 + :height: 510 + :size: 140 + :id: 58 + :updated_at: 2023-01-19 15:31:12.455459122 +02:00 + :updated_by: solsolsola123@gmail.com +- :name: sauna + :type: jpeg + :tags: '' + :width: 1440 + :height: 1080 + :size: 323 + :id: 59 + :updated_at: 2023-01-19 15:44:54.044049343 +02:00 + :updated_by: solsolsola123@gmail.com +- :name: soccer-ball-on-field + :type: jpeg + :tags: '' + :width: 390 + :height: 264 + :size: 45 + :id: 60 + :updated_at: 2023-01-19 15:57:15.796243982 +02:00 :updated_by: solsolsola123@gmail.com diff --git a/merged/pages.yml b/merged/pages.yml index 3e40292..13b006b 100644 --- a/merged/pages.yml +++ b/merged/pages.yml @@ -19,3 +19,13 @@ :type: page :updated_by: torsten@villataika.fi :id: 8 +- :name: work + :updated_at: 2023-01-19 12:19:26.304678489 +02:00 + :type: page + :updated_by: solsolsola123@gmail.com + :id: 9 +- :name: local_area + :updated_at: 2023-01-19 14:19:31.139069629 +02:00 + :type: page + :updated_by: torsten@villataika.fi + :id: 10 diff --git a/merged/sections.yml b/merged/sections.yml index a9fcede..7908a95 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -86,10 +86,10 @@ :id: 41 :options: {} - :template: section_full_up - :index: 5 + :index: 6 :page_id: 7 - :updated_at: 2023-01-18 23:53:07.932318628 +02:00 - :updated_by: torsten@villataika.fi + :updated_at: 2023-01-19 15:58:25.312124267 +02:00 + :updated_by: solsolsola123@gmail.com :id: 42 :options: background: light_blue @@ -201,9 +201,9 @@ :header: Before coming here :text: "things to know\r\n\r\nthe RULES" - :template: section_cards - :index: 1 + :index: 2 :page_id: 7 - :updated_at: 2023-01-18 14:51:45.049411060 +02:00 + :updated_at: 2023-01-19 15:29:14.848373050 +02:00 :updated_by: solsolsola123@gmail.com :id: 44 :card_template: card_feature_normal @@ -218,8 +218,8 @@ - :template: section_text :index: 3 :page_id: 7 - :updated_at: 2023-01-18 23:44:18.344294140 +02:00 - :updated_by: torsten@villataika.fi + :updated_at: 2023-01-19 15:58:14.700493187 +02:00 + :updated_by: solsolsola123@gmail.com :id: 46 :options: subheader: '' @@ -241,41 +241,76 @@ season's fresh and frozen veggies " :image_id: 54 :card_template: card_full_image -- :template: section_half_image - :index: 2 +- :template: section_cards + :index: 1 + :page_id: 9 + :updated_at: 2023-01-19 14:26:59.100565929 +02:00 + :updated_by: torsten@villataika.fi + :id: 50 + :options: {} + :card_template: card_full_image + :header: The workaway deal + :text: For about 5 hours of work 5 days a week you get basic food and accommodation. + On top of this everyone participates in keeping the accommodation area 3A clean + (we have cleaning shifts there every Wed & Sun). +- :template: section_full_up + :index: 1 + :page_id: 10 + :updated_at: 2023-01-19 14:26:14.946110645 +02:00 + :updated_by: torsten@villataika.fi + :id: 51 + :options: {} + :header: Day acivities locally + :text: '' +- :template: section_cards + :index: 1 :page_id: 7 - :header: Transportation - :text: "**Car** - The hub provides a luxuries peugeot \r\n**Bus** - a bus arrives - every hour to the nearby station\r\n**Bicycle** - prime ultra carbon nuclear powered - bicycle for your everyday use.\r\n**Train** - the nearby train station is perfect - for long distance travels \r\n**Sled** - Dont\r\n" + :header: general + :text: '' :options: + margin: 20 order: left - background: light_orange - text_color: none - text_align: center - subheader: '' - button_link: '' - button_text: '' - :updated_at: 2023-01-18 15:57:53.800567374 +02:00 - :updated_by: solsolsola123@gmail.com - :id: 47 - :image_id: 55 -- :template: section_half_image - :index: 4 - :page_id: 7 - :updated_at: 2023-01-18 16:01:00.954884636 +02:00 - :updated_by: solsolsola123@gmail.com - :id: 48 - :options: - order: left - background: light_blue text_color: none + background: none + columns: '3' subheader: '' text_align: left + :updated_at: 2023-01-19 15:29:01.888067415 +02:00 + :updated_by: solsolsola123@gmail.com + :id: 52 + :card_template: card_wide_square +- :template: section_small_image + :index: 4 + :page_id: 7 + :updated_at: 2023-01-19 15:37:54.580202354 +02:00 + :updated_by: solsolsola123@gmail.com + :id: 53 + :options: + subheader: '' + margin: '0' + order: left + text_color: none + background: light_blue button_link: '' button_text: '' - :image_id: 56 - :header: common utilities - :text: "**Washing machine** \r\n**kitchen** - common kitchen and lounge space\r\n**storage** - - individual shelves for dry/ non refrigirated food\r\n**Showers** \r\n\r\n" + :header: accommodation + :text: "hub feeing provides accommodation in double rooms, with shared showers and + common kitchen and lounge.\r\nthe volunteers have a dedicated corridor, where + 5 - 10 volunteers reside at all times. \r\nthe volunteers are allowed to use the + many hub facilities." + :image_id: 58 +- :template: section_cards + :index: 5 + :page_id: 7 + :updated_at: 2023-01-19 15:47:45.344999889 +02:00 + :updated_by: solsolsola123@gmail.com + :id: 54 + :card_template: card_normal_square + :options: + background: white + columns: '4' + subheader: '' + text_color: none + text_align: left + :header: facilities + :text: ''