diff --git a/.github/workflows/decidim_ci.yml b/.github/workflows/decidim_ci.yml index 147455f..a0f9cd4 100644 --- a/.github/workflows/decidim_ci.yml +++ b/.github/workflows/decidim_ci.yml @@ -36,8 +36,6 @@ jobs: ruby-version: ${{ env.RUBY_VERSION }} bundler-cache: true - uses: nanasess/setup-chromedriver@v2 - with: - chromedriver-version: 119.0.6045.105 - uses: actions/setup-node@v2 with: node-version: ${{ env.NODE_VERSION }} diff --git a/Gemfile.lock b/Gemfile.lock index fb25e7f..6f10381 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -658,7 +658,7 @@ GEM responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.2.5) + rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -734,7 +734,8 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) scout_apm (5.3.5) parser - selenium-webdriver (4.16.0) + selenium-webdriver (4.18.1) + base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) diff --git a/app/packs/stylesheets/decidim/decidim_application.scss b/app/packs/stylesheets/decidim/decidim_application.scss index 47e5116..ed17fbf 100644 --- a/app/packs/stylesheets/decidim/decidim_application.scss +++ b/app/packs/stylesheets/decidim/decidim_application.scss @@ -25,3 +25,11 @@ div.flash.progressing { background-color: var(--bg-progressing-2); border-color: var(--progressing); } + +.hero__container { + background-image: var(--hero-image); + + .hero__title { + @apply bg-gray-4 bg-opacity-50; + } +} diff --git a/config/initializers/metadecidim_menu.rb b/config/initializers/metadecidim_menu.rb index 5b34186..ee67702 100644 --- a/config/initializers/metadecidim_menu.rb +++ b/config/initializers/metadecidim_menu.rb @@ -15,13 +15,6 @@ position: 20, active: :inclusive - meetings_path = Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path - menu.add_item :meetings, - I18n.t("menu.meetings", scope: "decidim"), - meetings_path, - position: 30, - active: :inclusive - governance_path = Decidim::Assemblies::Engine.routes.url_helpers.assembly_path("our-governance") menu.add_item :governance, I18n.t("menu.governance", scope: "decidim"), @@ -36,6 +29,13 @@ position: 50, active: :inclusive + conferences_path = Decidim::Conferences::Engine.routes.url_helpers.conferences_path + menu.add_item :decidim_fest, + I18n.t("menu.decidim_fest", scope: "decidim"), + conferences_path, + position: 55, + active: :inclusive + chat_url = "http://chat.decidim.org" menu.add_item :chat, I18n.t("menu.chat", scope: "decidim"), @@ -79,6 +79,13 @@ position: 50, active: :inclusive + conferences_path = Decidim::Conferences::Engine.routes.url_helpers.conferences_path + menu.add_item :decidim_fest, + I18n.t("menu.decidim_fest", scope: "decidim"), + conferences_path, + position: 55, + active: :inclusive + chat_url = "http://chat.decidim.org" menu.add_item :chat, I18n.t("menu.chat", scope: "decidim"), diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 77e7db8..bab7364 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -3,8 +3,8 @@ ca: decidim: menu: chat: Xat - governance: Com ens organitzem - meetings: Trobades + decidim_fest: Decidim Fest + governance: L'Associació news: Notícies participate: Participa start_here: Comença aquí diff --git a/config/locales/en.yml b/config/locales/en.yml index b901c96..34395a0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3,8 +3,8 @@ en: decidim: menu: chat: Chat - governance: Our governance - meetings: Meetings + decidim_fest: Decidim Fest + governance: The Association news: News participate: Participate start_here: Start here diff --git a/config/locales/es.yml b/config/locales/es.yml index 4d85159..bdd2e4b 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -3,8 +3,8 @@ es: decidim: menu: chat: Chat - governance: Cómo nos organizamos - meetings: Encuentros + decidim_fest: Decidim Fest + governance: La Asociación news: Noticias participate: Participa start_here: Comienza aquí diff --git a/db/seeds.rb b/db/seeds.rb index b19cfc4..d98ddd9 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -28,3 +28,17 @@ Decidim::Assembly.first.update!(slug: 'our-governance') Decidim::ParticipatoryProcess.last.update!(slug: "news") Decidim::ParticipatoryProcess.last.components.where(manifest_name: 'blogs').first.update!(id: 1719, name: { en: 'news' }) + +seeds_root = File.join(__dir__, "seeds") +seeds_file = "homepage_image.png" + +seeds_image_blob = ActiveStorage::Blob.create_and_upload!( + io: File.open(File.join(seeds_root, seeds_file)), + filename: seeds_file, + content_type: "image/png", + metadata: nil +) + +hero_content_block = Decidim::ContentBlock.find_by(organization:, manifest_name: :hero, scope_name: :homepage) +hero_content_block.images_container.background_image = seeds_image_blob +hero_content_block.save! diff --git a/db/seeds/homepage_image.png b/db/seeds/homepage_image.png new file mode 100644 index 0000000..b0a7f3b Binary files /dev/null and b/db/seeds/homepage_image.png differ diff --git a/spec/features/menu_spec.rb b/spec/features/menu_spec.rb index e9c7b89..8b5516b 100644 --- a/spec/features/menu_spec.rb +++ b/spec/features/menu_spec.rb @@ -40,9 +40,9 @@ within "#home__menu" do expect(page).to have_content("Start here") expect(page).to have_content("Participate") - expect(page).to have_content("Meetings") - expect(page).to have_content("Our governance") + expect(page).to have_content("The Association") expect(page).to have_content("News") + expect(page).to have_content("Decidim Fest") expect(page).to have_content("Chat") end end @@ -54,8 +54,9 @@ expect(page).to have_content("Home") expect(page).to have_content("Start here") expect(page).to have_content("Participate") - expect(page).to have_content("Our governance") + expect(page).to have_content("The Association") expect(page).to have_content("News") + expect(page).to have_content("Decidim Fest") expect(page).to have_content("Chat") end end @@ -69,8 +70,9 @@ expect(page).to have_content("Home") expect(page).to have_content("Start here") expect(page).to have_content("Participate") - expect(page).to have_content("Our governance") + expect(page).to have_content("The Association") expect(page).to have_content("News") + expect(page).to have_content("Decidim Fest") expect(page).to have_content("Chat") end end @@ -88,9 +90,9 @@ within "#home__menu" do expect(page).to have_content("Comença aquí") expect(page).to have_content("Participa") - expect(page).to have_content("Trobades") - expect(page).to have_content("Com ens organitzem") + expect(page).to have_content("L'Associació") expect(page).to have_content("Notícies") + expect(page).to have_content("Decidim Fest") expect(page).to have_content("Xat") end end