diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 43a7f2a..dd1f755 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -56,8 +56,8 @@ module ApplicationHelper end def main_menu - [["/members" , "Volunteers"],["/stories" , "Stories"], ["/pictures" , "Gallery"], - ["/volunteering" , "Volunteering"] ] + [["/members" , "Resisent Artists"],["/stories" , "Stories"], ["/pictures" , "Gallery"], + ["/residency" , "Residency"] ] end def member_memu items =[["/forum" ,"Forum"] , [main_app.member_path(current_member) , "Settings"]] diff --git a/app/views/layouts/_footer.haml b/app/views/layouts/_footer.haml index e2a0fca..db0cd08 100644 --- a/app/views/layouts/_footer.haml +++ b/app/views/layouts/_footer.haml @@ -29,11 +29,11 @@ In Winter .col-span-2.sm:col-span-1 - %p.font-medium.text-gray-900 Volunteering + %p.font-medium.text-gray-900 Residency %nav.mt-6{"aria-label" => "Footer Navigation - Hub Feenix"} %ul.space-y-4.text-sm %li - %a.text-gray-700.transition.hover:opacity-75{:href => "/volunteering"} + %a.text-gray-700.transition.hover:opacity-75{:href => "/residency"} About Volunteeing %li %a.text-gray-700.transition.hover:opacity-75{:href => "/arriving"} @@ -47,7 +47,7 @@ %ul.space-y-4.text-sm %li %a.text-gray-700.transition.hover:opacity-75{:href => "/members"} - Volunteers + Resisent Artists %li %a.text-gray-700.transition.hover:opacity-75{:href => "/stories"} Stories diff --git a/app/views/layouts/_header.haml b/app/views/layouts/_header.haml index 87e2562..16dc77e 100644 --- a/app/views/layouts/_header.haml +++ b/app/views/layouts/_header.haml @@ -2,7 +2,7 @@ .relative.flex.items-center.justify-between %a.inline-flex.items-center{"aria-label" => "Hub Feenix", :href => "/", :title => "Hub Feenix"} = image_tag("feenix_lintu.webp" , class: "h-20") - %span.ml-2.text-xl.font-bold.text-gray-800 Volunteers @ Hub Feenix + %span.ml-2.text-xl.font-bold.text-gray-800 Resisent Artists @ Hub Feenix %ul.flex.items-center.hidden.space-x-8.lg:flex - main_menu.each do |link , text| %li diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml index 9aa533a..9c84f9b 100644 --- a/app/views/layouts/application.haml +++ b/app/views/layouts/application.haml @@ -2,7 +2,7 @@ %html %head %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/ - %title Hubfeenix Volunteers + %title Hubfeenix Resisent Artists %meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/ // https://www.favicon-generator.org/ %link{:href => "/apple-icon-57x57.png", :rel => "apple-touch-icon", :sizes => "57x57"}/ diff --git a/config/application.rb b/config/application.rb index a46ccab..5478d5c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -18,13 +18,13 @@ require "rails/test_unit/railtie" # you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) -module Volunteers +module Resisent Artists class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. config.load_defaults 7.0 config.hosts << "green-machine.local" #our "staging" - config.hosts << "volunteers.hubfeenix.fi" #production + config.hosts << "residency.hubfeenix.fi" #production config.active_job.queue_adapter = :sucker_punch diff --git a/config/database.yml b/config/database.yml index 2c793b0..1005814 100644 --- a/config/database.yml +++ b/config/database.yml @@ -5,16 +5,16 @@ default: &default development: <<: *default - database: volunteers_development + database: residency_development # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: <<: *default - database: volunteers_test + database: residency_test # production: <<: *default - database: volunteers_production + database: residency_production diff --git a/config/deploy.rb b/config/deploy.rb index f765f35..ce0cf03 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -8,11 +8,11 @@ require 'mina/rbenv' # for rbenv support. (https://rbenv.org) # repository - Git repo to clone from. (needed by mina/git) # branch - Branch name to deploy. (needed by mina/git) -set :application_name, 'volunteers' +set :application_name, 'residency' #set :domain, 'www.rubydesign.fi' set :domain, '192.168.129.10' -set :deploy_to, '/home/feenix/volunteers' -set :repository, "https://github.com/HubFeenixMakers/volunteers.git" +set :deploy_to, '/home/feenix/residency' +set :repository, "https://github.com/HubFeenixMakers/residency.git" set :branch, 'main' # Optional settings: diff --git a/merged/cards.yml b/merged/cards.yml index 6c1da85..2870ea0 100644 --- a/merged/cards.yml +++ b/merged/cards.yml @@ -2,7 +2,7 @@ - :section_id: 52 :index: 1 :header: Transportation - :text: "- **Car** - The Hub provides a volunteer car at cost price (0,20€/ km.) + :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. @@ -350,7 +350,7 @@ - :section_id: 53 :index: 1 :header: Kitchen + living room - :text: "Volunteers have a dedicated corridor for themselves, where you share a kitchen + :text: "Resisent 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: diff --git a/merged/pages.yml b/merged/pages.yml index 6e5c20e..0a9c0fc 100644 --- a/merged/pages.yml +++ b/merged/pages.yml @@ -28,7 +28,7 @@ :id: 10 :options: {} :redirects: local_area -- :name: volunteering +- :name: residency :updated_at: 2023-01-25 03:26:10.291551136 +02:00 :type: page :updated_by: torsten@villataika.fi diff --git a/merged/sections.yml b/merged/sections.yml index bfceb88..3388a64 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -160,7 +160,7 @@ text_align: left columns: '2' :header: Living - :text: "Volunteers live in their own shared community. There is usually between + :text: "Resisent 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 @@ -194,7 +194,7 @@ color: none text_align: center text_color: none - :header: Volunteering at Hub Feenix + :header: Residency at Hub Feenix :text: "Hub Feenix is a non-profit organisation hoping to bring all kinds of people together.\r\nWe welcome also travellers on a budget that prefer to work rather than pay money.\r\n\r\nMostly this happends through the [workaway site](https://www.workaway.info/en/host/735959816971), @@ -326,7 +326,7 @@ longer treks around the Hub.\r\n\r\n**Mushroom and berry picking** -popular Finnish hobby in the late summer and autumn! Great way to spend time in the forrest and possibly find some healthy ingredients for cooking.\r\n\r\n**Sharing your skills - with others** - it's fun to have little workshops together with other volunteers, + with others** - it's fun to have little workshops together with other residency, 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..." @@ -454,7 +454,7 @@ subheader: '' text_color: none text_align: left - :header: Join the Hub as volunteer + :header: Join the Hub as resident artist :text: "If you want to apply, the best way is through workway.\r\n\r\nIn any case, a successful application usually contains the following:\r\n- your reason to join the Hub\r\n- details about you\r\n- the work you could contribute\r\n- your timing