Skip to content

Commit

Permalink
Add the "before and after" video in a loop (#354)
Browse files Browse the repository at this point in the history
* Add the "before and after" video in a loop

* Bump rubocop gem versions

* Fix rubocop offenses
  • Loading branch information
andreslucena authored Dec 20, 2023
1 parent baa7bed commit 1d710f7
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 24 deletions.
39 changes: 24 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,10 @@ GEM
io-console (0.5.11)
irb (1.4.1)
reline (>= 0.3.0)
json (2.6.2)
json (2.7.1)
kramdown (2.4.0)
rexml
language_server-protocol (3.17.0.3)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand Down Expand Up @@ -166,9 +167,10 @@ GEM
padrino-support (= 0.15.1)
tilt (>= 1.4.1, < 3)
padrino-support (0.15.1)
parallel (1.22.1)
parser (3.1.2.1)
parallel (1.24.0)
parser (3.2.2.4)
ast (~> 2.4.1)
racc
parslet (2.0.0)
progress (3.6.0)
public_suffix (5.0.0)
Expand Down Expand Up @@ -198,10 +200,10 @@ GEM
rb-inotify (0.10.1)
ffi (~> 1.0)
redcarpet (3.5.1)
regexp_parser (2.5.0)
regexp_parser (2.8.3)
reline (0.3.1)
io-console (~> 0.5)
rexml (3.2.5)
rexml (3.2.6)
rspec (3.11.0)
rspec-core (~> 3.11.0)
rspec-expectations (~> 3.11.0)
Expand All @@ -215,26 +217,33 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-support (3.11.1)
rubocop (1.36.0)
rubocop (1.59.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.1.2.1)
parser (>= 3.2.2.4)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.20.1, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.21.0)
parser (>= 3.1.1.0)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.19.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.24.0)
rubocop (~> 1.33)
rubocop-faker (1.1.0)
faker (>= 2.12.0)
rubocop (>= 0.82.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.13.1)
rubocop (~> 1.33)
ruby-progressbar (1.11.0)
rubocop-rspec (2.25.0)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
ruby-progressbar (1.13.0)
sassc (2.4.0)
ffi (~> 1.9)
servolux (0.13.0)
Expand All @@ -250,7 +259,7 @@ GEM
concurrent-ruby (~> 1.0)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (2.3.0)
unicode-display_width (2.5.0)
webrick (1.7.0)
xpath (3.2.0)
nokogiri (~> 1.8)
Expand Down
2 changes: 1 addition & 1 deletion lib/i18n_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module I18nHelpers
# @param loc [Symbol] The current locale
# @param current_path [String] The current page. We give it as a parameter to it's easier to test.
def current_path_for_locale(loc = I18n.locale, current_path = current_page.url)
url_regex = %r{\A/(?:(#{I18n.available_locales.join('|')})/)?}
url_regex = %r{\A/(?:(#{I18n.available_locales.join("|")})/)?}
if current_path.gsub(url_regex, "").blank?
home_for_locale(loc)
else
Expand Down
2 changes: 2 additions & 0 deletions source/blog/en/2023-12-20-new-version-0-28-0.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ title: New version 0.28.0

The main highlight of version 0.28 is **the complete redesign of Decidim**, both for participant and administrator interfaces.

<video src="/uploads/release-0.28.0-before-and-after.webm" controls="controls" style="max-width: 100%;" loop></video>

This mission began with a set of [principles guiding the entire process](https://meta.decidim.org/processes/RedesignDecidim/f/1662/posts/235). Let's delve into how we've applied several of these principles:

### Simplicity
Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

require "middleman-blog"

middleman_app = ::Middleman::Application.new do
middleman_app = Middleman::Application.new do
set :root, File.expand_path(File.join(File.dirname(__FILE__), ".."))
set :environment, :test
set :show_exceptions, false
end

Capybara.app = ::Middleman::Rack.new(middleman_app).to_app
Capybara.app = Middleman::Rack.new(middleman_app).to_app

RSpec.configure do |config|
# rspec-expectations config goes here. You can use an alternate
Expand Down
4 changes: 2 additions & 2 deletions spec/system/index_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
end

it "has the correct title header" do
expect(page).to have_selector "h1"
expect(page).to have_css "h1"
within "h1" do
expect(page).to have_content(/Decidim is a digital platform for citizen participation/i)
end
end

it "has a navigation with the languages" do
expect(page).to have_selector "nav details"
expect(page).to have_css "nav details"

within "nav details" do
expect(page).to have_text "Castellano"
Expand Down
4 changes: 2 additions & 2 deletions spec/system/language_selector_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
end

it "has the correct title header" do
expect(page).to have_selector "h1"
expect(page).to have_css "h1"
within "h1" do
expect(page).to have_content "Decidim és una plataforma digital de participació ciutadana"
end
end

it "changes the locale" do
expect(page).to have_selector "nav details"
expect(page).to have_css "nav details"

within "nav details" do
expect(page).to have_text "Castellano"
Expand Down
4 changes: 2 additions & 2 deletions spec/system/pages_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
end

it "has the correct title header" do
expect(page).to have_selector "h1"
expect(page).to have_css "h1"
within "h1" do
expect(page).to have_content(/Trademark policy/i)
end
end

it "has the correct links" do
expect(page).to have_selector "main"
expect(page).to have_css "main"

within "main" do
expect(page).to have_link "Ruby on Rails", href: "https://rubyonrails.org/trademarks"
Expand Down

0 comments on commit 1d710f7

Please sign in to comment.