diff --git a/.gitignore b/.gitignore index efa09b6..3c5ed62 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,14 @@ config/deploy config/deploy.rb config/application.yml Capfile + +/node_modules +/yarn-error.log +yarn-debug.log* +.yarn-integrity + +/public/decidim-packs +/public/packs +/public/packs-test + +.rubocop-* diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/decidim-openheritage.iml b/.idea/decidim-openheritage.iml new file mode 100644 index 0000000..ffafd3c --- /dev/null +++ b/.idea/decidim-openheritage.iml @@ -0,0 +1,517 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + file://$MODULE_DIR$/app + + + file://$MODULE_DIR$/app/assets + + + file://$MODULE_DIR$/app/channels + + + file://$MODULE_DIR$/app/controllers + + + file://$MODULE_DIR$/app/helpers + + + file://$MODULE_DIR$/app/mailers + + + file://$MODULE_DIR$/app/models + + + file://$MODULE_DIR$/app/views + + + file://$MODULE_DIR$/config + + + file://$MODULE_DIR$/config/cable.yml + + + file://$MODULE_DIR$/config/database.yml + + + file://$MODULE_DIR$/config/environment.rb + + + file://$MODULE_DIR$/config/environments + + + file://$MODULE_DIR$/config/initializers + + + file://$MODULE_DIR$/config/locales + + + file://$MODULE_DIR$/config/routes.rb + + + file://$MODULE_DIR$/config + + + file://$MODULE_DIR$/db + + + file://$MODULE_DIR$/db/migrate + + + file://$MODULE_DIR$/db/seeds.rb + + + file://$MODULE_DIR$/lib + + + file://$MODULE_DIR$/lib/assets + + + file://$MODULE_DIR$/lib/tasks + + + file://$MODULE_DIR$/lib/templates + + + file://$MODULE_DIR$/log/development.log + + + file://$MODULE_DIR$/public + + + file://$MODULE_DIR$/public/javascripts + + + file://$MODULE_DIR$/public/stylesheets + + + file://$MODULE_DIR$/tmp + + + file://$MODULE_DIR$/vendor + + + file://$MODULE_DIR$/vendor/assets + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..cff1354 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..96d9163 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..af03b17 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.rubocop.yml b/.rubocop.yml index 870c0b9..f38b127 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,3 +1,21 @@ -inherit_from: - - .rubocop_ruby.yml - - .rubocop_rails.yml +inherit_from: https://raw.githubusercontent.com/decidim/decidim/release/0.25-stable/.rubocop.yml + +AllCops: + Include: + - "**/*.rb" + - "**/*.rake" + - "**/*.ru" + - "**/Gemfile" + - "**/Rakefile" + Exclude: + - "development_app/**/*" + - "**/development_app/**/*" + - "spec/decidim_dummy_app/**/*" + - "**/spec/decidim_dummy_app/**/*" + - "bin/**/*" + - "node_modules/**/*" + - "**/node_modules/**/*" + - "db/schema.rb" + - "db/migrate/*" + - "vendor/**/*" + - "**/vendor/**/*" \ No newline at end of file diff --git a/.rubocop_rails.yml b/.rubocop_rails.yml deleted file mode 100644 index 0cf3b44..0000000 --- a/.rubocop_rails.yml +++ /dev/null @@ -1,87 +0,0 @@ -require: rubocop-rails - -Rails: - Enabled: true - -Rails/ActionFilter: - Include: - - app/controllers/**/*.rb - -Rails/ContentTag: - Enabled: false - -Rails/CreateTableWithTimestamps: - Enabled: false - -Rails/EnumUniqueness: - Include: - - app/models/**/*.rb - -Rails/Exit: - Include: - - app/**/*.rb - - config/**/*.rb - - lib/**/*.rb - Exclude: - - lib/**/*.rake - -Rails/FindBy: - Include: - - "**/*.rb" - -Rails/FindEach: - Include: - - app/models/**/*.rb - -Rails/HasAndBelongsToMany: - Include: - - app/models/**/*.rb - -Rails/HasManyOrHasOneDependent: - Include: - - app/models/**/*.rb - -Rails/InverseOf: - Enabled: false - -Rails/LexicallyScopedActionFilter: - Include: - - app/controllers/**/*.rb - -Rails/NotNullColumn: - Enabled: false - -Rails/Output: - Include: - - app/**/*.rb - - config/**/*.rb - - db/**/*.rb - - lib/**/*.rb - Exclude: - - db/seeds.rb -Rails/OutputSafety: - Enabled: false - -Rails/Pluck: - Enabled: false - -Rails/RakeEnvironment: - Enabled: false - -Rails/ReadWriteAttribute: - Include: - - app/models/**/*.rb - -Rails/ReversibleMigration: - Enabled: false - -Rails/ScopeArgs: - Include: - - app/models/**/*.rb - -Rails/SkipsModelValidations: - Enabled: true - -Rails/Validation: - Include: - - app/models/**/*.rb diff --git a/.rubocop_ruby.yml b/.rubocop_ruby.yml deleted file mode 100644 index 5933038..0000000 --- a/.rubocop_ruby.yml +++ /dev/null @@ -1,1754 +0,0 @@ -require: - - rubocop-rspec - - rubocop-faker - -# Common configuration. -AllCops: - Include: - - .simplecov - - "**/*.rb" - - "**/*.rake" - - "**/*.gemspec" - - "**/*.ru" - - "**/Gemfile" - - "**/Rakefile" - Exclude: - - "**/vendor/**/*" - - "development_app/**/*" - - "spec/decidim_dummy_app/**/*" - - "node_modules/**/*" - - "db/migrate/*" - - "db/schema.rb" - # Default formatter will be used if no -f/--format option is given. - DefaultFormatter: progress - # Cop names are not displayed in offense messages by default. Change behavior - # by overriding DisplayCopNames, or by giving the -D/--display-cop-names - # option. - DisplayCopNames: true - # Style guide URLs are not displayed in offense messages by default. Change - # behavior by overriding DisplayStyleGuide, or by giving the - # -S/--display-style-guide option. - DisplayStyleGuide: false - # Extra details are not displayed in offense messages by default. Change - # behavior by overriding ExtraDetails, or by giving the - # -E/--extra-details option. - ExtraDetails: false - NewCops: enable - # Additional cops that do not reference a style guide rule may be enabled by - # default. Change behavior by overriding StyleGuideCopsOnly, or by giving - # the --only-guide-cops option. - StyleGuideCopsOnly: false - # All cops except the ones in disabled.yml are enabled by default. Change - # this behavior by overriding DisabledByDefault. When DisabledByDefault is - # true, all cops in the default configuration are disabled, and and only cops - # in user configuration are enabled. This makes cops opt-in instead of - # opt-out. Note that when DisabledByDefault is true, cops in user - # configuration will be enabled even if they don't set the Enabled parameter. - DisabledByDefault: false - # Enables the result cache if true. Can be overridden by the --cache command - # line option. - UseCache: true - # Threshold for how many files can be stored in the result cache before some - # of the files are automatically removed. - MaxFilesInCache: 20000 - # The cache will be stored in "rubocop_cache" under this directory. The name - # "/tmp" is special and will be converted to the system temporary directory, - # which is "/tmp" on Unix-like systems, but could be something else on other - # systems. - CacheRootDirectory: /tmp - # The default cache root directory is /tmp, which on most systems is - # writable by any system user. This means that it is possible for a - # malicious user to anticipate the location of Rubocop's cache directory, - # and create a symlink in its place that could cause Rubocop to overwrite - # unintended files, or read malicious input. If you are certain that your - # cache location is secure from this kind of attack, and wish to use a - # symlinked cache location, set this value to "true". - AllowSymlinksInCacheRootDirectory: true - # What MRI version of the Ruby interpreter is the inspected code intended to - # run on? (If there is more than one, set this to the lowest version.) - # If a value is specified for TargetRubyVersion then it is used. - # Else if .ruby-version exists and it contains an MRI version it is used. - # Otherwise we fallback to the oldest officially supported Ruby version (2.0). - TargetRubyVersion: 2.7 - - RSpec: - Patterns: - - "(?:^|/)spec/" - - "(?:^|/)test/" - -# Indent private/protected/public as deep as method definitions -Layout/AccessModifierIndentation: - EnforcedStyle: indent - SupportedStyles: - - outdent - - indent - # By default, the indentation width from Style/IndentationWidth is used - # But it can be overridden by setting this parameter - IndentationWidth: ~ - -Style/Alias: - EnforcedStyle: prefer_alias - SupportedStyles: - - prefer_alias - - prefer_alias_method - -# Align the elements of a hash literal if they span more than one line. -Layout/HashAlignment: - # Alignment of entries using hash rocket as separator. Valid values are: - # - # key - left alignment of keys - # "a" => 2 - # "bb" => 3 - # separator - alignment of hash rockets, keys are right aligned - # "a" => 2 - # "bb" => 3 - # table - left alignment of keys, hash rockets, and values - # "a" => 2 - # "bb" => 3 - EnforcedHashRocketStyle: key - # Alignment of entries using colon as separator. Valid values are: - # - # key - left alignment of keys - # a: 0 - # bb: 1 - # separator - alignment of colons, keys are right aligned - # a: 0 - # bb: 1 - # table - left alignment of keys and values - # a: 0 - # bb: 1 - EnforcedColonStyle: key - # Select whether hashes that are the last argument in a method call should be - # inspected? Valid values are: - # - # always_inspect - Inspect both implicit and explicit hashes. - # Registers an offense for: - # function(a: 1, - # b: 2) - # Registers an offense for: - # function({a: 1, - # b: 2}) - # always_ignore - Ignore both implicit and explicit hashes. - # Accepts: - # function(a: 1, - # b: 2) - # Accepts: - # function({a: 1, - # b: 2}) - # ignore_implicit - Ignore only implicit hashes. - # Accepts: - # function(a: 1, - # b: 2) - # Registers an offense for: - # function({a: 1, - # b: 2}) - # ignore_explicit - Ignore only explicit hashes. - # Accepts: - # function({a: 1, - # b: 2}) - # Registers an offense for: - # function(a: 1, - # b: 2) - EnforcedLastArgumentHashStyle: always_inspect - SupportedLastArgumentHashStyles: - - always_inspect - - always_ignore - - ignore_implicit - - ignore_explicit - -Layout/ParameterAlignment: - # Alignment of parameters in multi-line method calls. - # - # The `with_first_parameter` style aligns the following lines along the same - # column as the first parameter. - # - # method_call(a, - # b) - # - # The `with_fixed_indentation` style aligns the following lines with one - # level of indentation relative to the start of the line with the method call. - # - # method_call(a, - # b) - EnforcedStyle: with_first_parameter - SupportedStyles: - - with_first_parameter - - with_fixed_indentation - # By default, the indentation width from Style/IndentationWidth is used - # But it can be overridden by setting this parameter - IndentationWidth: ~ - -Style/AndOr: - # Whether `and` and `or` are banned only in conditionals (conditionals) - # or completely (always). - EnforcedStyle: always - SupportedStyles: - - always - - conditionals - -Style/AsciiComments: - Enabled: false - -# Checks if usage of %() or %Q() matches configuration. -Style/BarePercentLiterals: - EnforcedStyle: bare_percent - SupportedStyles: - - percent_q - - bare_percent - -Style/BlockDelimiters: - EnforcedStyle: line_count_based - SupportedStyles: - # The `line_count_based` style enforces braces around single line blocks and - # do..end around multi-line blocks. - - line_count_based - # The `semantic` style enforces braces around functional blocks, where the - # primary purpose of the block is to return a value and do..end for - # procedural blocks, where the primary purpose of the block is its - # side-effects. - # - # This looks at the usage of a block's method to determine its type (e.g. is - # the result of a `map` assigned to a variable or passed to another - # method) but exceptions are permitted in the `ProceduralMethods`, - # `FunctionalMethods` and `IgnoredMethods` sections below. - - semantic - # The `braces_for_chaining` style enforces braces around single line blocks - # and do..end around multi-line blocks, except for multi-line blocks whose - # return value is being chained with another method (in which case braces - # are enforced). - - braces_for_chaining - ProceduralMethods: - # Methods that are known to be procedural in nature but look functional from - # their usage, e.g. - # - # time = Benchmark.realtime do - # foo.bar - # end - # - # Here, the return value of the block is discarded but the return value of - # `Benchmark.realtime` is used. - - benchmark - - bm - - bmbm - - create - - each_with_object - - measure - - new - - realtime - - tap - - with_object - FunctionalMethods: - # Methods that are known to be functional in nature but look procedural from - # their usage, e.g. - # - # let(:foo) { Foo.new } - # - # Here, the return value of `Foo.new` is used to define a `foo` helper but - # doesn't appear to be used from the return value of `let`. - - let - - let! - - subject - - watch - IgnoredMethods: - # Methods that can be either procedural or functional and cannot be - # categorised from their usage alone, e.g. - # - # foo = lambda do |x| - # puts "Hello, #{x}" - # end - # - # foo = lambda do |x| - # x * 100 - # end - # - # Here, it is impossible to tell from the return value of `lambda` whether - # the inner block's return value is significant. - - lambda - - proc - - it - -Style/ExplicitBlockArgument: - Enabled: false - -Style/HashEachMethods: - Enabled: false - -Style/HashLikeCase: - MinBranchesCount: 5 - -# Indentation of `when`. -Layout/CaseIndentation: - EnforcedStyle: case - SupportedStyles: - - case - - end - IndentOneStep: false - # By default, the indentation width from Style/IndentationWidth is used - # But it can be overridden by setting this parameter - # This only matters if IndentOneStep is true - IndentationWidth: ~ - -Style/ClassAndModuleChildren: - Enabled: false - # Checks the style of children definitions at classes and modules. - # - # Basically there are two different styles: - # - # `nested` - have each child on a separate line - # class Foo - # class Bar - # end - # end - # - # `compact` - combine definitions as much as possible - # class Foo::Bar - # end - # - # The compact style is only forced, for classes / modules with one child. - EnforcedStyle: nested - SupportedStyles: - - nested - - compact - -Style/ClassCheck: - EnforcedStyle: is_a? - SupportedStyles: - - is_a? - - kind_of? - -# Align with the style guide. -Style/CollectionMethods: - # Mapping from undesired method to desired_method - # e.g. to use `detect` over `find`: - # - # CollectionMethods: - # PreferredMethods: - # find: detect - PreferredMethods: - collect: "map" - collect!: "map!" - inject: "reduce" - detect: "find" - find_all: "select" - -# Use ` or %x around command literals. -Style/CommandLiteral: - EnforcedStyle: backticks - # backticks: Always use backticks. - # percent_x: Always use %x. - # mixed: Use backticks on single-line commands, and %x on multi-line commands. - SupportedStyles: - - backticks - - percent_x - - mixed - # If false, the cop will always recommend using %x if one or more backticks - # are found in the command string. - AllowInnerBackticks: false - -# Checks formatting of special comments -Style/CommentAnnotation: - Keywords: - - TODO - - FIXME - - OPTIMIZE - - HACK - - REVIEW - -Style/ConditionalAssignment: - EnforcedStyle: assign_to_condition - SupportedStyles: - - assign_to_condition - - assign_inside_condition - # When configured to `assign_to_condition`, `SingleLineConditionsOnly` - # will only register an offense when all branches of a condition are - # a single line. - # When configured to `assign_inside_condition`, `SingleLineConditionsOnly` - # will only register an offense for assignment to a condition that has - # at least one multiline branch. - SingleLineConditionsOnly: true - -# Checks that you have put a copyright in a comment before any code. -# -# You can override the default Notice in your .rubocop.yml file. -# -# In order to use autocorrect, you must supply a value for the -# AutocorrectNotice key that matches the regexp Notice. A blank -# AutocorrectNotice will cause an error during autocorrect. -# -# Autocorrect will add a copyright notice in a comment at the top -# of the file immediately after any shebang or encoding comments. -# -# Example rubocop.yml: -# -# Style/Copyright: -# Enabled: true -# Notice: 'Copyright (\(c\) )?2015 Yahoo! Inc' -# AutocorrectNotice: "# Copyright (c) 2015 Yahoo! Inc." -# -Style/Copyright: - Notice: '^Copyright (\(c\) )?2[0-9]{3} .+' - AutocorrectNotice: "" - -Style/DocumentationMethod: - RequireForNonPublicMethods: false - -# Multi-line method chaining should be done with leading dots. -Layout/DotPosition: - EnforcedStyle: leading - SupportedStyles: - - leading - - trailing - -# Warn on empty else statements -# empty - warn only on empty else -# nil - warn on else with nil in it -# both - warn on empty else and else with nil in it -Style/EmptyElse: - EnforcedStyle: both - SupportedStyles: - - empty - - nil - - both - -# Use empty lines between defs. -Layout/EmptyLineBetweenDefs: - # If true, this parameter means that single line method definitions don't - # need an empty line between them. - AllowAdjacentOneLineDefs: false - -Layout/EmptyLinesAroundBlockBody: - EnforcedStyle: no_empty_lines - SupportedStyles: - - empty_lines - - no_empty_lines - -Layout/EmptyLinesAroundClassBody: - EnforcedStyle: no_empty_lines - SupportedStyles: - - empty_lines - - no_empty_lines - -Layout/EmptyLinesAroundModuleBody: - EnforcedStyle: no_empty_lines - SupportedStyles: - - empty_lines - - no_empty_lines - -# Checks whether the source file has a utf-8 encoding comment or not -# AutoCorrectEncodingComment must match the regex -# /#.*coding\s?[:=]\s?(?:UTF|utf)-8/ -Style/Encoding: - Enabled: true - -Layout/ExtraSpacing: - # When true, allows most uses of extra spacing if the intent is to align - # things with the previous or next line, not counting empty lines or comment - # lines. - AllowForAlignment: false - # When true, forces the alignment of = in assignments on consecutive lines. - ForceEqualSignAlignment: false - -Naming/FileName: - Exclude: - - "**/Gemfile" - - "**/Rakefile" - - "**/*.gemspec" - # When true, requires that each source file should define a class or module - # with a name which matches the file name (converted to ... case). - # It further expects it to be nested inside modules which match the names - # of subdirectories in its path. - ExpectMatchingDefinition: false - # If non-nil, expect all source file names to match the following regex. - # Only the file name itself is matched, not the entire file path. - # Use anchors as necessary if you want to match the entire name rather than - # just a part of it. - Regex: ~ - # With `IgnoreExecutableScripts` set to `true`, this cop does not - # report offending filenames for executable scripts (i.e. source - # files with a shebang in the first line). - IgnoreExecutableScripts: true - -Layout/FirstArgumentIndentation: - EnforcedStyle: special_for_inner_method_call_in_parentheses - SupportedStyles: - # The first parameter should always be indented one step more than the - # preceding line. - - consistent - # The first parameter should normally be indented one step more than the - # preceding line, but if it's a parameter for a method call that is itself - # a parameter in a method call, then the inner parameter should be indented - # relative to the inner method. - - special_for_inner_method_call - # Same as special_for_inner_method_call except that the special rule only - # applies if the outer method call encloses its arguments in parentheses. - - special_for_inner_method_call_in_parentheses - # By default, the indentation width from Style/IndentationWidth is used - # But it can be overridden by setting this parameter - IndentationWidth: ~ - -# Checks use of for or each in multiline loops. -Style/For: - EnforcedStyle: each - SupportedStyles: - - for - - each - -# Enforce the method used for string formatting. -Style/FormatString: - EnforcedStyle: format - SupportedStyles: - - format - - sprintf - - percent - -Style/FormatStringToken: - EnforcedStyle: template - -Style/FrozenStringLiteralComment: - EnforcedStyle: always - SupportedStyles: - - never - # `always` will always add the frozen string literal comment to a file - # regardless of the Ruby version or if `freeze` or `<<` are called on a - # string literal. If you run code against multiple versions of Ruby, it is - # possible that this will create errors in Ruby 2.3.0+. - - always - -# Built-in global variables are allowed by default. -Style/GlobalVars: - AllowedVariables: [] - -# `MinBodyLength` defines the number of lines of the a body of an if / unless -# needs to have to trigger this cop -Style/GuardClause: - MinBodyLength: 6 - -Style/HashSyntax: - EnforcedStyle: ruby19 - SupportedStyles: - # checks for 1.9 syntax (e.g. {a: 1}) for all symbol keys - - ruby19 - # checks for hash rocket syntax for all hashes - - hash_rockets - # forbids mixed key syntaxes (e.g. {a: 1, :b => 2}) - - no_mixed_keys - # enforces both ruby19 and no_mixed_keys styles - - ruby19_no_mixed_keys - # Force hashes that have a symbol value to use hash rockets - UseHashRocketsWithSymbolValues: false - # Do not suggest { a?: 1 } over { :a? => 1 } in ruby19 style - PreferHashRocketsForNonAlnumEndingSymbols: false - -Layout/IndentationConsistency: - # The difference between `rails` and `normal` is that the `rails` style - # prescribes that in classes and modules the `protected` and `private` - # modifier keywords shall be indented the same as public methods and that - # protected and private members shall be indented one step more than the - # modifiers. Other than that, both styles mean that entities on the same - # logical depth shall have the same indentation. - EnforcedStyle: normal - SupportedStyles: - - normal - - rails - -Layout/IndentationWidth: - # Number of spaces for each indentation level. - Width: 2 - -# Checks the indentation of the first element in an array literal. -Layout/FirstArrayElementIndentation: - # The value `special_inside_parentheses` means that array literals with - # brackets that have their opening bracket on the same line as a surrounding - # opening round parenthesis, shall have their first element indented relative - # to the first position inside the parenthesis. - # - # The value `consistent` means that the indentation of the first element shall - # always be relative to the first position of the line where the opening - # bracket is. - # - # The value `align_brackets` means that the indentation of the first element - # shall always be relative to the position of the opening bracket. - EnforcedStyle: special_inside_parentheses - SupportedStyles: - - special_inside_parentheses - - consistent - - align_brackets - # By default, the indentation width from Style/IndentationWidth is used - # But it can be overridden by setting this parameter - IndentationWidth: ~ - -# Checks the indentation of assignment RHS, when on a different line from LHS -Layout/AssignmentIndentation: - # By default, the indentation width from Style/IndentationWidth is used - # But it can be overridden by setting this parameter - IndentationWidth: ~ - -# Checks the indentation of the first key in a hash literal. -Layout/FirstHashElementIndentation: - # The value `special_inside_parentheses` means that hash literals with braces - # that have their opening brace on the same line as a surrounding opening - # round parenthesis, shall have their first key indented relative to the - # first position inside the parenthesis. - # - # The value `consistent` means that the indentation of the first key shall - # always be relative to the first position of the line where the opening - # brace is. - # - # The value `align_braces` means that the indentation of the first key shall - # always be relative to the position of the opening brace. - EnforcedStyle: special_inside_parentheses - SupportedStyles: - - special_inside_parentheses - - consistent - - align_braces - # By default, the indentation width from Style/IndentationWidth is used - # But it can be overridden by setting this parameter - IndentationWidth: ~ - -Style/Lambda: - EnforcedStyle: line_count_dependent - SupportedStyles: - - line_count_dependent - - lambda - - literal - Exclude: - - "**/types/**/*" - - "**/*_interface.rb" - -Style/LambdaCall: - EnforcedStyle: call - SupportedStyles: - - call - - braces - -Style/Next: - # With `always` all conditions at the end of an iteration needs to be - # replaced by next - with `skip_modifier_ifs` the modifier if like this one - # are ignored: [1, 2].each { |a| return "yes" if a == 1 } - EnforcedStyle: skip_modifier_ifs - # `MinBodyLength` defines the number of lines of the a body of an if / unless - # needs to have to trigger this cop - MinBodyLength: 3 - SupportedStyles: - - skip_modifier_ifs - - always - -Style/NonNilCheck: - # With `IncludeSemanticChanges` set to `true`, this cop reports offenses for - # `!x.nil?` and autocorrects that and `x != nil` to solely `x`, which is - # **usually** OK, but might change behavior. - # - # With `IncludeSemanticChanges` set to `false`, this cop does not report - # offenses for `!x.nil?` and does no changes that might change behavior. - IncludeSemanticChanges: false - -Style/NumericPredicate: - EnforcedStyle: predicate - SupportedStyles: - - predicate - - comparison - -Style/MethodDefParentheses: - EnforcedStyle: require_parentheses - SupportedStyles: - - require_parentheses - - require_no_parentheses - - require_no_parentheses_except_multiline - -Naming/MethodName: - EnforcedStyle: snake_case - SupportedStyles: - - snake_case - - camelCase - -Style/ModuleFunction: - EnforcedStyle: module_function - SupportedStyles: - - module_function - - extend_self - -Layout/MultilineArrayBraceLayout: - EnforcedStyle: symmetrical - SupportedStyles: - # symmetrical: closing brace is positioned in same way as opening brace - # new_line: closing brace is always on a new line - # same_line: closing brace is always on the same line as last element - - symmetrical - - new_line - - same_line - -Layout/MultilineAssignmentLayout: - # The types of assignments which are subject to this rule. - SupportedTypes: - - block - - case - - class - - if - - kwbegin - - module - EnforcedStyle: new_line - SupportedStyles: - # Ensures that the assignment operator and the rhs are on the same line for - # the set of supported types. - - same_line - # Ensures that the assignment operator and the rhs are on separate lines - # for the set of supported types. - - new_line - -Layout/MultilineHashBraceLayout: - EnforcedStyle: symmetrical - SupportedStyles: - # symmetrical: closing brace is positioned in same way as opening brace - # new_line: closing brace is always on a new line - # same_line: closing brace is always on same line as last element - - symmetrical - - new_line - - same_line - -Layout/MultilineMethodCallBraceLayout: - EnforcedStyle: symmetrical - SupportedStyles: - # symmetrical: closing brace is positioned in same way as opening brace - # new_line: closing brace is always on a new line - # same_line: closing brace is always on the same line as last argument - - symmetrical - - new_line - - same_line - -Layout/MultilineMethodCallIndentation: - EnforcedStyle: aligned - SupportedStyles: - - aligned - - indented - - indented_relative_to_receiver - # By default, the indentation width from Style/IndentationWidth is used - # But it can be overridden by setting this parameter - IndentationWidth: ~ - -Layout/MultilineMethodDefinitionBraceLayout: - EnforcedStyle: symmetrical - SupportedStyles: - # symmetrical: closing brace is positioned in same way as opening brace - # new_line: closing brace is always on a new line - # same_line: closing brace is always on the same line as last parameter - - symmetrical - - new_line - - same_line - -Layout/MultilineOperationIndentation: - EnforcedStyle: aligned - SupportedStyles: - - aligned - - indented - # By default, the indentation width from Style/IndentationWidth is used - # But it can be overridden by setting this parameter - IndentationWidth: ~ - -Style/NumericLiterals: - MinDigits: 5 - -Style/NumericLiteralPrefix: - EnforcedOctalStyle: zero_with_o - SupportedOctalStyles: - - zero_with_o - - zero_only - -Style/OptionHash: - # A list of parameter names that will be flagged by this cop. - SuspiciousParamNames: - - options - - opts - - args - - params - - parameters - -# Allow safe assignment in conditions. -Style/ParenthesesAroundCondition: - AllowSafeAssignment: true - -Style/PercentLiteralDelimiters: - PreferredDelimiters: - "%": () - "%i": () - "%q": () - "%Q": () - "%r": "{}" - "%s": () - "%w": () - "%W": () - "%x": () - -Style/PercentQLiterals: - EnforcedStyle: lower_case_q - SupportedStyles: - - lower_case_q # Use %q when possible, %Q when necessary - - upper_case_q # Always use %Q - -Style/SlicingWithRange: - Enabled: false - -Naming/PredicateName: - # Predicate name prefixes. - NamePrefix: - - is_ - - has_ - - have_ - # Predicate name prefixes that should be removed. - ForbiddenPrefixes: - - is_ - - have_ - # Predicate names which, despite having a blacklisted prefix, or no ?, - # should still be accepted - AllowedMethods: - - is_a? - # Exclude Rspec specs because there is a strong convetion to write spec - # helpers in the form of `have_something` or `be_something`. - Exclude: - - "**/spec/**/*" - - "**/test/**/*" - -Style/PreferredHashMethods: - Enabled: true - EnforcedStyle: verbose - -Style/DateTime: - Enabled: true - -Style/Documentation: - Enabled: false - -Style/RaiseArgs: - EnforcedStyle: exploded - SupportedStyles: - - compact # raise Exception.new(msg) - - exploded # raise Exception, msg - -Style/RedundantReturn: - # When true allows code like `return x, y`. - AllowMultipleReturnValues: false - -# Use / or %r around regular expressions. -Style/RegexpLiteral: - EnforcedStyle: slashes - # slashes: Always use slashes. - # percent_r: Always use %r. - # mixed: Use slashes on single-line regexes, and %r on multi-line regexes. - SupportedStyles: - - slashes - - percent_r - - mixed - # If false, the cop will always recommend using %r if one or more slashes - # are found in the regexp string. - AllowInnerSlashes: false - -Style/SafeNavigation: - Enabled: false - -Style/Semicolon: - # Allow ; to separate several expressions on the same line. - AllowAsExpressionSeparator: false - -Style/SignalException: - EnforcedStyle: only_raise - SupportedStyles: - - only_raise - - only_fail - - semantic - -Style/SingleLineBlockParams: - Methods: - - reduce: - - a - - e - - inject: - - a - - e - -Style/SingleLineMethods: - AllowIfMethodIsEmpty: true - -Layout/SpaceBeforeFirstArg: - # When true, allows most uses of extra spacing if the intent is to align - # things with the previous or next line, not counting empty lines or comment - # lines. - AllowForAlignment: true - -Style/SpecialGlobalVars: - EnforcedStyle: use_english_names - SupportedStyles: - - use_perl_names - - use_english_names - -Style/StabbyLambdaParentheses: - EnforcedStyle: require_parentheses - SupportedStyles: - - require_parentheses - - require_no_parentheses - -Style/StringLiterals: - EnforcedStyle: double_quotes - SupportedStyles: - - single_quotes - - double_quotes - # If true, strings which span multiple lines using \ for continuation must - # use the same type of quotes on each line. - ConsistentQuotesInMultiline: false - -Style/StringLiteralsInInterpolation: - EnforcedStyle: double_quotes - SupportedStyles: - - single_quotes - - double_quotes - -Style/StringMethods: - # Mapping from undesired method to desired_method - # e.g. to use `to_sym` over `intern`: - # - # StringMethods: - # PreferredMethods: - # intern: to_sym - PreferredMethods: - intern: to_sym - -Layout/SpaceAroundBlockParameters: - EnforcedStyleInsidePipes: no_space - -Layout/SpaceAroundEqualsInParameterDefault: - EnforcedStyle: space - SupportedStyles: - - space - - no_space - -Layout/SpaceAroundOperators: - # When true, allows most uses of extra spacing if the intent is to align - # with an operator on the previous or next line, not counting empty lines - # or comment lines. - AllowForAlignment: true - -Layout/SpaceBeforeBlockBraces: - EnforcedStyle: space - SupportedStyles: - - space - - no_space - -Layout/SpaceInsideBlockBraces: - EnforcedStyle: space - SupportedStyles: - - space - - no_space - # Valid values are: space, no_space - EnforcedStyleForEmptyBraces: no_space - # Space between { and |. Overrides EnforcedStyle if there is a conflict. - SpaceBeforeBlockParameters: true - -Layout/SpaceInsideHashLiteralBraces: - EnforcedStyle: space - EnforcedStyleForEmptyBraces: no_space - SupportedStyles: - - space - - no_space - # "compact" normally requires a space inside hash braces, with the exception - # that successive left braces or right braces are collapsed together - - compact - -Layout/SpaceInsideStringInterpolation: - EnforcedStyle: no_space - SupportedStyles: - - space - - no_space - -Style/AccessModifierDeclarations: - Enabled: false - -Style/SymbolArray: - EnforcedStyle: brackets - SupportedStyles: - - percent - - brackets - -Style/SymbolProc: - # A list of method names to be ignored by the check. - # The names should be fairly unique, otherwise you'll end up ignoring lots of code. - IgnoredMethods: - - respond_to - - define_method - -Style/TernaryParentheses: - EnforcedStyle: require_no_parentheses - SupportedStyles: - - require_parentheses - - require_no_parentheses - AllowSafeAssignment: true - -Layout/TrailingEmptyLines: - EnforcedStyle: final_newline - SupportedStyles: - - final_newline - - final_blank_line - -Style/TrailingCommaInArguments: - # If `comma`, the cop requires a comma after the last argument, but only for - # parenthesized method calls where each argument is on its own line. - # If `consistent_comma`, the cop requires a comma after the last argument, - # for all parenthesized method calls with arguments. - EnforcedStyleForMultiline: no_comma - -Style/TrailingCommaInArrayLiteral: - # If `comma`, the cop requires a comma after the last item in an array or - # hash, but only when each item is on its own line. - # If `consistent_comma`, the cop requires a comma after the last item of all - # non-empty array and hash literals. - EnforcedStyleForMultiline: no_comma - -Style/TrailingCommaInHashLiteral: - # If `comma`, the cop requires a comma after the last item in an array or - # hash, but only when each item is on its own line. - # If `consistent_comma`, the cop requires a comma after the last item of all - # non-empty array and hash literals. - EnforcedStyleForMultiline: no_comma - -# TrivialAccessors requires exact name matches and doesn't allow -# predicated methods by default. -Style/TrivialAccessors: - # When set to false the cop will suggest the use of accessor methods - # in situations like: - # - # def name - # @other_name - # end - # - # This way you can uncover "hidden" attributes in your code. - ExactNameMatch: true - AllowPredicates: true - # Allows trivial writers that don't end in an equal sign. e.g. - # - # def on_exception(action) - # @on_exception=action - # end - # on_exception :restart - # - # Commonly used in DSLs - AllowDSLWriters: false - IgnoreClassMethods: false - AllowedMethods: - - to_ary - - to_a - - to_c - - to_enum - - to_h - - to_hash - - to_i - - to_int - - to_io - - to_open - - to_path - - to_proc - - to_r - - to_regexp - - to_str - - to_s - - to_sym - -Naming/VariableName: - EnforcedStyle: snake_case - SupportedStyles: - - snake_case - - camelCase - -Naming/VariableNumber: - EnforcedStyle: normalcase - SupportedStyles: - - snake_case - - normalcase - - non_integer - -# WordArray enforces how array literals of word-like strings should be expressed. -Style/WordArray: - EnforcedStyle: percent - SupportedStyles: - # percent style: %w(word1 word2) - - percent - # bracket style: ["word1", "word2"] - - brackets - # The MinSize option causes the WordArray rule to be ignored for arrays - # smaller than a certain size. The rule is only applied to arrays - # whose element count is greater than or equal to MinSize. - MinSize: 2 - # The regular expression WordRegex decides what is considered a word. - WordRegex: !ruby/regexp '/\A[\p{Word}\n\t]+\z/' - -##################### Metrics ################################## - -Metrics/AbcSize: - # The ABC size is a calculated magnitude, so this number can be an Integer or - # a Float. - Max: 15 - Enabled: false - -Metrics/BlockNesting: - Max: 3 - -Metrics/ClassLength: - CountComments: false # count full line comments? - Max: 100 - Enabled: false - -Metrics/ModuleLength: - CountComments: false # count full line comments? - Max: 100 - Enabled: false - -# Avoid complex methods. -Metrics/CyclomaticComplexity: - Max: 9 - Exclude: - - "bin/bundle" - - "decidim-admin/app/queries/decidim/admin/newsletter_recipients.rb" - - "**/*/dummy_authorization_handler.rb" - - "**/*/permissions.rb" - -Metrics/MethodLength: - CountComments: false # count full line comments? - Max: 15 - Enabled: false - -Metrics/ParameterLists: - Max: 5 - CountKeywordArgs: true - Exclude: - - "decidim-core/lib/decidim/filter_form_builder.rb" - -Metrics/PerceivedComplexity: - Max: 10 - Exclude: - - "decidim-admin/app/queries/decidim/admin/newsletter_recipients.rb" - - "**/*/dummy_authorization_handler.rb" - - "**/*/permissions.rb" - -##################### Lint ################################## - -Lint/AmbiguousBlockAssociation: - Enabled: true - Exclude: - - "**/abilities/**/*" - -# Allow safe assignment in conditions. -Lint/AssignmentInCondition: - AllowSafeAssignment: true - -Lint/ConstantDefinitionInBlock: - Enabled: false - -# Call super to initialize state of the parent class. -Lint/MissingSuper: - Enabled: false - -# checks whether the end keywords are aligned properly for `do` `end` blocks. -Layout/BlockAlignment: - # The value `start_of_block` means that the `end` should be aligned with line - # where the `do` keyword appears. - # The value `start_of_line` means it should be aligned with the whole - # expression's starting line. - # The value `either` means both are allowed. - EnforcedStyleAlignWith: either - -# Align ends correctly. -Layout/EndAlignment: - # The value `keyword` means that `end` should be aligned with the matching - # keyword (if, while, etc.). - # The value `variable` means that in assignments, `end` should be aligned - # with the start of the variable on the left hand side of `=`. In all other - # situations, `end` should still be aligned with the keyword. - # The value `start_of_line` means that `end` should be aligned with the start - # of the line which the matching keyword appears on. - EnforcedStyleAlignWith: keyword - AutoCorrect: false - -Layout/DefEndAlignment: - # The value `def` means that `end` should be aligned with the def keyword. - # The value `start_of_line` means that `end` should be aligned with method - # calls like `private`, `public`, etc, if present in front of the `def` - # keyword on the same line. - EnforcedStyleAlignWith: start_of_line - AutoCorrect: false - -Lint/InheritException: - # The default base class in favour of `Exception`. - EnforcedStyle: runtime_error - SupportedStyles: - - runtime_error - - standard_error - -Layout/LineLength: - Max: 180 - # To make it possible to copy or click on URIs in the code, we allow lines - # containing a URI to be longer than Max. - AllowHeredoc: true - AllowURI: true - URISchemes: - - http - - https - Exclude: - - "**/spec/**/*" - -# Checks for unused block arguments -Lint/UnusedBlockArgument: - IgnoreEmptyBlocks: true - AllowUnusedKeywordArguments: false - -# Checks for unused method arguments. -Lint/UnusedMethodArgument: - AllowUnusedKeywordArguments: false - IgnoreEmptyMethods: true - -##################### Performance ############################ - -Metrics/BlockLength: - Enabled: false - -RSpec/BeforeAfterAll: - Enabled: true - -RSpec/ContextWording: - Enabled: true - Prefixes: - - when - - with - - without - - and - -RSpec/DescribeClass: - Exclude: - - spec/gemfiles_spec.rb - - spec/js_bundles_spec.rb - - spec/i18n_spec.rb - - "**/*/spec/**/*_badge_spec.rb" - - decidim-core/spec/lib/global_engines_spec.rb - - "**/tasks/**/*" - -RSpec/EmptyExampleGroup: - Exclude: - - decidim-core/spec/lib/participatory_space_manifest_spec.rb - -RSpec/ExampleLength: - Max: 49 - -RSpec/ExpectInHook: - Enabled: false - -RSpec/IteratedExpectation: - Enabled: true - -RSpec/LetSetup: - Enabled: false - -RSpec/MessageSpies: - Enabled: false - -RSpec/MultipleExpectations: - Enabled: false - -RSpec/MultipleMemoizedHelpers: - Max: 35 - -RSpec/NestedGroups: - Max: 7 - -RSpec/NamedSubject: - Enabled: false - -RSpec/RepeatedExampleGroupDescription: - Enabled: false - -RSpec/RepeatedExampleGroupBody: - Enabled: false -RSpec/VerifiedDoubles: - Enabled: false - -RSpec/LeakyConstantDeclaration: - Enabled: false - -RSpec/DescribedClass: - Enabled: false - -# This is the default configuration file. - -Faker/DeprecatedArguments: - Description: 'Checks that Faker arguments style is based on Faker 2.' - Enabled: true - VersionAdded: '0.1' - Reference: 'https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md#v20-2019-31-07' - ArgumentKeywords: - # - # FakerClassName: - # method_name: - # - keyword_name_for_first_argument - # - keyword_name_for_second_argument - # - keyword_name_for_third_argument - # - Faker::Dune: - quote: - - character - saying: - - source - Faker::Books::Lovecraft: - fhtagn: - - number - sentence: - - word_count - - random_words_to_add - words: - - number - - spaces_allowed - sentences: - - number - paragraph: - - sentence_count - - random_sentences_to_add - paragraphs: - - number - paragraph_by_chars: - - characters - Faker::Address: - city: - - options - street_address: - - include_secondary - zip_code: - - state_abbreviation - country_by_code: - - code - country_name_to_code: - - name - Faker::Alphanumeric: - alpha: - - number - alphanumeric: - - number - Faker::App: - semantic_version: - - major - - minor - - patch - Faker::Avatar: - image: - - slug - - size - - format - - set - - bgset - Faker::Bank: - account_number: - - digits - iban: - - country_code - Faker::Boolean: - boolean: - - true_ratio - Faker::ChileRut: - rut: - - min_rut - - fixed - full_rut: - - min_rut - - fixed - Faker::Code: - isbn: - - base - ean: - - base - nric: - - min_age - - max_age - Faker::Commerce: - promotion_code: - - digits - department: - - max - - fixed_amount - price: - - range - - as_string - Faker::Company: - polish_register_of_national_economy: - - length - brazilian_company_number: - - formatted - Faker::CryptoCoin: - coin_name: - - coin - acronym: - - coin - url_logo: - - coin - Faker::Date: - between: - - from - - to - between_except: - - from - - to - - excepted - forward: - - days - backward: - - days - birthday: - - min_age - - max_age - Faker::Demographic: - height: - - unit - Faker::DrivingLicence: - british_driving_licence: - - last_name - - initials - - gender - - date_of_birth - Faker::File: - dir: - - segment_count - - root - - directory_separator - file_name: - - dir - - name - - ext - - directory_separator - Faker::Fillmurray: - image: - - grayscale - - width - - height - Faker::Finance: - vat_number: - - country - Faker::Hipster: - words: - - number - - supplemental - - spaces_allowed - sentence: - - word_count - - supplemental - - random_words_to_add - sentences: - - number - - supplemental - paragraph: - - sentence_count - - supplemental - - random_sentences_to_add - paragraphs: - - number - - supplemental - paragraph_by_chars: - - characters - - supplemental - Faker::IDNumber: - brazilian_citizen_number: - - formatted - brazilian_id: - - formatted - Faker::Internet: - email: - - name - - separators - free_email: - - name - safe_email: - - name - username: - - specifier - - separators - password: - - min_length - - max_length - - mix_case - - special_characters - domain_name: - - subdomain - fix_umlauts: - - string - mac_address: - - prefix - url: - - host - - path - - scheme - slug: - - words - - glue - user_agent: - - vendor - Faker::Invoice: - amount_between: - - from - - to - creditor_reference: - - ref - reference: - - ref - Faker::Json: - shallow_json: - - width - - options - add_depth_to_json: - - json - - width - - options - Faker::Lorem: - words: - - number - - supplemental - characters: - - number - sentence: - - word_count - - supplemental - - random_words_to_add - sentences: - - number - - supplemental - paragraph: - - sentence_count - - supplemental - - random_sentences_to_add - paragraphs: - - number - - supplemental - paragraph_by_chars: - - number - - supplemental - question: - - word_count - - supplemental - - random_words_to_add - questions: - - number - - supplemental - Faker::LoremFlickr: - image: - - size - - search_terms - - match_all - grayscale_image: - - size - - search_terms - - match_all - pixelated_image: - - size - - search_terms - - match_all - colorized_image: - - size - - color - - search_terms - - match_all - Faker::LoremPixel: - image: - - size - - is_gray - - category - - number - - text - - secure - Faker::Markdown: - sandwich: - - sentences - - repeat - Faker::Measurement: - height: - - amount - length: - - amount - volume: - - amount - weight: - - amount - metric_height: - - amount - metric_length: - - amount - metric_volume: - - amount - metric_weight: - - amount - Faker::Name: - initials: - - number - Faker::NationalHealthService: - check_digit: - - number - Faker::Number: - number: - - digits - leading_zero_number: - - digits - decimal_part: - - digits - decimal: - - l_digits - - r_digits - hexadecimal: - - digits - normal: - - mean - - standard_deviation - between: - - from - - to - within: - - range - positive: - - from - - to - negative: - - from - - to - Faker::Omniauth: - google: - - name - - email - - uid - facebook: - - name - - email - - username - - uid - twitter: - - name - - nickname - - uid - linkedin: - - name - - email - - uid - github: - - name - - email - - uid - Faker::PhoneNumber: - subscriber_number: - - length - Faker::Placeholdit: - image: - - size - - format - - background_color - - text_color - - text - Faker::Relationship: - familial: - - connection - Faker::Source: - hello_world: - - lang - print: - - str - - lang - print_1_to_10: - - lang - Faker::String: - random: - - length - Faker::Stripe: - valid_card: - - card_type - valid_token: - - card_type - invalid_card: - - card_error - ccv: - - card_type - Faker::Time: - between: - - from - - to - - format - between_dates: - - from - - to - - period - - format - forward: - - days - - period - - format - backward: - - days - - period - - format - Faker::Twitter: - user: - - include_status - - include_email - status: - - include_user - - include_photo - status_entities: - - include_photo - Faker::Types: - rb_string: - - words - rb_integer: - - from - - to - rb_hash: - - number - - type - complex_rb_hash: - - number - rb_array: - - len - Faker::Vehicle: - model: - - make_of_model - mileage: - - min - - max - license_plate: - - state_abbreviation - Faker::WorldCup: - group: - - group - roster: - - country - - type - Faker::Dota: - quote: - - hero - Faker::Movies::StarWars: - quote: - - character - Decidim::Faker::Localized: - words: - - number - - supplemental - characters: - - number - sentence: - - word_count - - supplemental - - random_words_to_add - sentences: - - number - - supplemental - paragraph: - - sentence_count - - supplemental - - random_sentences_to_add - paragraphs: - - number - - supplemental - paragraph_by_chars: - - number - - supplemental - question: - - word_count - - supplemental - - random_words_to_add - questions: - - number - - supplemental - diff --git a/Gemfile b/Gemfile index 66e6f84..98c369e 100644 --- a/Gemfile +++ b/Gemfile @@ -4,40 +4,34 @@ source "https://rubygems.org" ruby RUBY_VERSION -# DECIDIM_VERSION={:path => "../decidim"} -DECIDIM_VERSION = { git: "https://github.com/Platoniq/decidim", branch: "temp/0.24" }.freeze +DECIDIM_VERSION = "~> 0.25.0" gem "decidim", DECIDIM_VERSION -gem "decidim-alternative_landing", git: "https://github.com/Platoniq/decidim-module-alternative_landing", branch: "main" -# gem "decidim-alternative_landing", path: "../landing" -gem "decidim-comparative_stats", "~> 1.1.0" gem "decidim-conferences", DECIDIM_VERSION gem "decidim-consultations", DECIDIM_VERSION -gem "decidim-decidim_awesome", "~> 0.7.2" -gem "decidim-navigation_maps", "~> 1.2.0" gem "decidim-templates", DECIDIM_VERSION -# gem "decidim-initiatives", DECIDIM_VERSION -gem "decidim-notify", "~> 0.4.0" -gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer", branch: "0.24-stable" -gem "decidim-time_tracker", git: "https://github.com/Platoniq/decidim-module-time_tracker" -gem "decidim-direct_verifications", "~> 0.22" -gem "jquery-slick-rails" -gem "redcarpet" -gem "simplemde-rails" +gem "decidim-alternative_landing", git: "https://github.com/Platoniq/decidim-module-alternative_landing", branch: "release/0.26-stable" +gem "decidim-comparative_stats", git: "https://github.com/Platoniq/decidim-module-comparative_stats", branch: "release/0.25-stable" +gem "decidim-decidim_awesome", "~> 0.8" +gem "decidim-direct_verifications", git: "https://github.com/Platoniq/decidim-verifications-direct_verifications", branch: "release/0.25-stable" +gem "decidim-navigation_maps", git: "https://github.com/Platoniq/decidim-module-navigation_maps", branch: "release/0.26-stable" +gem "decidim-notify", "~> 0.5" +gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer", branch: "release/0.25-stable" +gem "decidim-time_tracker", git: "https://github.com/Platoniq/decidim-module-time_tracker", branch: "release/0.25-stable" gem "bootsnap", "~> 1.4" gem "health_check" gem "sentry-rails" gem "sentry-ruby" -gem "wicked_pdf", "~> 1.4" +gem "wicked_pdf", "~> 2.1" gem "puma", ">= 5.0.0" gem "uglifier", "~> 4.1" gem "faker", "~> 2.14" -gem "rspec" +gem "rspec", "~> 3.10" gem "rubocop-faker" group :development, :test do @@ -49,8 +43,8 @@ end group :development do gem "letter_opener_web", "~> 1.3" gem "listen", "~> 3.1" - gem "spring", "~> 2.0" - gem "spring-watcher-listen", "~> 2.0" + gem "spring", "~> 4.0" + gem "spring-watcher-listen", "~> 2.1" gem "web-console", "~> 3.5" gem "capistrano", "~> 3.14" diff --git a/Gemfile.lock b/Gemfile.lock index 8fab848..d4b7f5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,319 +1,147 @@ GIT - remote: https://github.com/Platoniq/decidim - revision: a532a7e8fc66140ef23ae5d4c90d4435327700d3 - branch: temp/0.24 + remote: https://github.com/Platoniq/decidim-module-alternative_landing + revision: 7aeeedc12cd168dbacd775557e2ee48f78955754 + branch: release/0.26-stable specs: - decidim (0.24.3) - decidim-accountability (= 0.24.3) - decidim-admin (= 0.24.3) - decidim-api (= 0.24.3) - decidim-assemblies (= 0.24.3) - decidim-blogs (= 0.24.3) - decidim-budgets (= 0.24.3) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) - decidim-debates (= 0.24.3) - decidim-forms (= 0.24.3) - decidim-generators (= 0.24.3) - decidim-meetings (= 0.24.3) - decidim-pages (= 0.24.3) - decidim-participatory_processes (= 0.24.3) - decidim-proposals (= 0.24.3) - decidim-sortitions (= 0.24.3) - decidim-surveys (= 0.24.3) - decidim-system (= 0.24.3) - decidim-templates (= 0.24.3) - decidim-verifications (= 0.24.3) - decidim-accountability (0.24.3) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) - kaminari (~> 1.2, >= 1.2.1) - searchlight (~> 4.1) - decidim-admin (0.24.3) - active_link_to (~> 1.0) - decidim-core (= 0.24.3) - devise (~> 4.7) - devise-i18n (~> 1.2) - devise_invitable (~> 1.7) - jquery-rails (~> 4.4) - sassc (~> 2.4.0) - sassc-rails (~> 2.1.2) - decidim-api (0.24.3) - graphiql-rails (~> 1.4, < 1.5) - graphql (~> 1.12, >= 1.12.3) - rack-cors (~> 1.0) - redcarpet (~> 3.5, >= 3.5.1) - sprockets-es6 (~> 0.9.2) - decidim-assemblies (0.24.3) - decidim-core (= 0.24.3) - decidim-blogs (0.24.3) - decidim-admin (= 0.24.3) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) - jquery-tmpl-rails (~> 1.1) - kaminari (~> 1.2, >= 1.2.1) - decidim-budgets (0.24.3) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) - kaminari (~> 1.2, >= 1.2.1) - searchlight (~> 4.1) - decidim-comments (0.24.3) - decidim-core (= 0.24.3) - jquery-rails (~> 4.4) - redcarpet (~> 3.5, >= 3.5.1) - decidim-conferences (0.24.3) - decidim-core (= 0.24.3) - decidim-meetings (= 0.24.3) - wicked_pdf (~> 1.4) - wkhtmltopdf-binary (~> 0.12) - decidim-consultations (0.24.3) - decidim-admin (= 0.24.3) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) - decidim-core (0.24.3) - active_link_to (~> 1.0) - anchored (~> 1.1) - autoprefixer-rails (~> 8.0) - batch-loader (~> 1.2) - browser (~> 2.7) - carrierwave (~> 2.2.1) - cells-erb (~> 0.1.0) - cells-rails (~> 0.0.9) - charlock_holmes (~> 0.7) - date_validator (~> 0.9.0) - decidim-api (= 0.24.3) - devise (~> 4.7) - devise-i18n (~> 1.2) - diffy (~> 3.3) - doorkeeper (~> 5.1) - doorkeeper-i18n (~> 4.0) - etherpad-lite (~> 0.3) - file_validators (~> 2.1) - fog-local (~> 0.6) - foundation-rails (~> 6.6, < 6.7) - foundation_rails_helper (~> 3.0) - geocoder (~> 1.5) - hashdiff (>= 0.4.0, < 2.0.0) - invisible_captcha (~> 0.12) - jquery-rails (~> 4.4) - kaminari (~> 1.2, >= 1.2.1) - loofah (~> 2.3.1) - mini_magick (~> 4.9) - mustache (~> 1.1.0) - nobspw (~> 0.6.0) - omniauth (~> 1.9) - omniauth-facebook (~> 5.0) - omniauth-google-oauth2 (~> 0.7) - omniauth-rails_csrf_protection (~> 0.1) - omniauth-twitter (~> 1.4) - paper_trail (~> 10.3) - pg (~> 1.1.4, < 2) - pg_search (~> 2.2) - premailer-rails (~> 1.10) - rack (~> 2.2, >= 2.2.3) - rack-attack (~> 6.0) - rails (~> 5.2.6) - rails-i18n (~> 5.0) - rectify (~> 0.13.0) - redis (~> 4.1) - request_store (~> 1.5.0) - rubyzip (~> 2.0) - sassc (~> 2.4.0) - sassc-rails (~> 2.1.2) - seven_zip_ruby (~> 1.3) - social-share-button (~> 1.2, >= 1.2.1) - spreadsheet (~> 1.2) - sprockets (~> 3.7, < 4) - sprockets-es6 (~> 0.9.2) - truncato (~> 0.7) - uglifier (~> 4.1) - valid_email2 (~> 2.1) - wisper (~> 2.0) - decidim-debates (0.24.3) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) - kaminari (~> 1.2, >= 1.2.1) - searchlight (~> 4.1) - decidim-dev (0.24.3) - byebug (~> 11.0) - capybara (~> 3.24) - db-query-matchers (~> 0.9.0) - decidim (= 0.24.3) - erb_lint (~> 0.0.28) - factory_bot_rails (~> 4.8) - i18n-tasks (~> 0.9.18) - mdl (~> 0.5) - nokogiri (~> 1.11, >= 1.11.4) - puffing-billy (~> 2.4.0) - puma (~> 5.0) - rails-controller-testing (~> 1.0) - rspec-cells (~> 0.3.4) - rspec-html-matchers (~> 0.9.1) - rspec-rails (~> 3.7) - rspec-retry (~> 0.6.2) - rspec_junit_formatter (~> 0.3.0) - rubocop (~> 0.92.0) - rubocop-rails (~> 2.0) - rubocop-rspec (~> 1.21) - selenium-webdriver (~> 3.142) - simplecov (~> 0.19.0) - simplecov-cobertura (~> 1.3.1) - system_test_html_screenshots (~> 0.1.1) - vcr (~> 6.0) - webmock (~> 3.6) - wisper-rspec (~> 1.0) - decidim-forms (0.24.3) - decidim-core (= 0.24.3) - wicked_pdf (~> 1.4) - wkhtmltopdf-binary (~> 0.12) - decidim-generators (0.24.3) - decidim-core (= 0.24.3) - decidim-meetings (0.24.3) - cells-erb (~> 0.1.0) - cells-rails (~> 0.0.9) - decidim-core (= 0.24.3) - decidim-forms (= 0.24.3) - icalendar (~> 2.5) - jquery-tmpl-rails (~> 1.1) - kaminari (~> 1.2, >= 1.2.1) - searchlight (~> 4.1) - decidim-pages (0.24.3) - decidim-core (= 0.24.3) - decidim-participatory_processes (0.24.3) - decidim-core (= 0.24.3) - decidim-proposals (0.24.3) - acts_as_list (~> 0.9) - cells-erb (~> 0.1.0) - cells-rails (~> 0.0.9) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) - doc2text (~> 0.4.3) - kaminari (~> 1.2, >= 1.2.1) - ransack (~> 2.1.1) - redcarpet (~> 3.5, >= 3.5.1) - decidim-sortitions (0.24.3) - decidim-admin (= 0.24.3) - decidim-comments (= 0.24.3) - decidim-core (= 0.24.3) - decidim-proposals (= 0.24.3) - decidim-surveys (0.24.3) - decidim-core (= 0.24.3) - decidim-forms (= 0.24.3) - decidim-templates (= 0.24.3) - decidim-system (0.24.3) - active_link_to (~> 1.0) - decidim-core (= 0.24.3) - devise (~> 4.7) - devise-i18n (~> 1.2) - devise_invitable (~> 1.7) - jquery-rails (~> 4.4) - sassc (~> 2.4.0) - sassc-rails (~> 2.1.2) - decidim-templates (0.24.3) - decidim-core (= 0.24.3) - decidim-forms (= 0.24.3) - decidim-verifications (0.24.3) - decidim-core (= 0.24.3) + decidim-alternative_landing (0.3.0) + decidim-admin (>= 0.25.0, < 0.27) + decidim-core (>= 0.25.0, < 0.27) + redcarpet (~> 3.4) GIT - remote: https://github.com/Platoniq/decidim-module-alternative_landing - revision: 4def433c78b2a5125ebc0c1cb1332ed226802ef0 - branch: main + remote: https://github.com/Platoniq/decidim-module-comparative_stats + revision: 338aa5b0c05360963951c69e06e9a82e47538718 + branch: release/0.25-stable specs: - decidim-alternative_landing (0.2.1) - decidim-admin (= 0.24.3) - decidim-core (= 0.24.3) - redcarpet (~> 3.4) + decidim-comparative_stats (1.2.0) + chartkick (~> 4.0) + decidim-admin (>= 0.25.0, < 0.26) + decidim-core (>= 0.25.0, < 0.26) + graphlient (< 0.6) + +GIT + remote: https://github.com/Platoniq/decidim-module-navigation_maps + revision: 6ac6ecefc20278295eb2c0e6a40c654f8649aa1e + branch: release/0.26-stable + specs: + decidim-navigation_maps (1.3.4) + decidim-admin (>= 0.25, < 0.27) + decidim-core (>= 0.25, < 0.27) GIT remote: https://github.com/Platoniq/decidim-module-time_tracker - revision: 80b1ec0c35125607e1f99ca2a589a32d4c160bc3 + revision: bd939ae1a35700095d8550082d06cb02c3b4a03f + branch: release/0.25-stable specs: - decidim-time_tracker (0.3) - decidim-accountability (>= 0.23.1) - decidim-admin (>= 0.23.1) - decidim-core (>= 0.23.1) - decidim-forms (>= 0.23.1) - wicked_pdf (~> 1.4) + decidim-time_tracker (0.4) + decidim-accountability (>= 0.25.0, < 0.27) + decidim-admin (>= 0.25.0, < 0.27) + decidim-core (>= 0.25.0, < 0.27) + decidim-forms (>= 0.25.0, < 0.27) + wicked_pdf (~> 2.1) wkhtmltopdf-binary (~> 0.12) +GIT + remote: https://github.com/Platoniq/decidim-verifications-direct_verifications + revision: 831653db0c831ef2a298c0f1b869d9e7e921fef2 + branch: release/0.25-stable + specs: + decidim-direct_verifications (1.2.1) + decidim-admin (>= 0.25.0) + decidim-core (>= 0.25.0) + GIT remote: https://github.com/mainio/decidim-module-term_customizer - revision: 4b385c55996e390406ac68a8b5ab68b9da2c8817 - branch: 0.24-stable + revision: 1d20451c56b7809cf0d509bbb4d0ac63d4791c8c + branch: release/0.25-stable specs: - decidim-term_customizer (0.24.0) - decidim-admin (~> 0.24.0) - decidim-core (~> 0.24.0) + decidim-term_customizer (0.25.0) + decidim-admin (~> 0.25.0) + decidim-core (~> 0.25.0) GEM remote: https://rubygems.org/ specs: - actioncable (5.2.6.2) - actionpack (= 5.2.6.2) + actioncable (6.0.6.1) + actionpack (= 6.0.6.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.6.2) - actionpack (= 5.2.6.2) - actionview (= 5.2.6.2) - activejob (= 5.2.6.2) + actionmailbox (6.0.6.1) + actionpack (= 6.0.6.1) + activejob (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) + mail (>= 2.7.1) + actionmailer (6.0.6.1) + actionpack (= 6.0.6.1) + actionview (= 6.0.6.1) + activejob (= 6.0.6.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.6.2) - actionview (= 5.2.6.2) - activesupport (= 5.2.6.2) + actionpack (6.0.6.1) + actionview (= 6.0.6.1) + activesupport (= 6.0.6.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.6.2) - activesupport (= 5.2.6.2) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.6.1) + actionpack (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) + nokogiri (>= 1.8.5) + actionview (6.0.6.1) + activesupport (= 6.0.6.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) + rails-html-sanitizer (~> 1.1, >= 1.2.0) active_link_to (1.0.5) actionpack addressable - activejob (5.2.6.2) - activesupport (= 5.2.6.2) + activejob (6.0.6.1) + activesupport (= 6.0.6.1) globalid (>= 0.3.6) - activemodel (5.2.6.2) - activesupport (= 5.2.6.2) - activerecord (5.2.6.2) - activemodel (= 5.2.6.2) - activesupport (= 5.2.6.2) - arel (>= 9.0) - activestorage (5.2.6.2) - actionpack (= 5.2.6.2) - activerecord (= 5.2.6.2) - marcel (~> 1.0.0) - activesupport (5.2.6.2) + activemodel (6.0.6.1) + activesupport (= 6.0.6.1) + activerecord (6.0.6.1) + activemodel (= 6.0.6.1) + activesupport (= 6.0.6.1) + activestorage (6.0.6.1) + actionpack (= 6.0.6.1) + activejob (= 6.0.6.1) + activerecord (= 6.0.6.1) + marcel (~> 1.0) + activesupport (6.0.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) acts_as_list (0.9.19) activerecord (>= 3.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - airbrussh (1.4.0) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + airbrussh (1.5.1) sshkit (>= 1.6.1, != 1.7.0) anchored (1.1.0) - arel (9.0.0) ast (2.4.2) - autoprefixer-rails (8.6.5) - execjs + axe-core-api (4.8.2) + dumb_delegator + virtus + axe-core-rspec (4.1.0) + axe-core-api + dumb_delegator + virtus axiom-types (0.1.1) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) - babel-source (5.8.35) - babel-transpiler (0.7.0) - babel-source (>= 4.0, < 6) - execjs (~> 2.0) + base64 (0.2.0) batch-loader (1.5.0) - bcrypt (3.1.16) + bcrypt (3.1.20) better_html (1.0.16) actionview (>= 4.0) activesupport (>= 4.0) @@ -322,22 +150,23 @@ GEM html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties + bigdecimal (3.1.7) bindex (0.8.1) - bootsnap (1.10.3) + bootsnap (1.18.3) msgpack (~> 1.2) browser (2.7.1) builder (3.2.4) byebug (11.1.3) - capistrano (3.16.0) + capistrano (3.18.1) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (2.0.1) + capistrano-bundler (2.1.0) capistrano (~> 3.1) capistrano-passenger (0.2.1) capistrano (~> 3.0) - capistrano-rails (1.6.2) + capistrano-rails (1.6.3) capistrano (~> 3.1) capistrano-bundler (>= 1.1, < 3) capistrano-rails-console (2.3.0) @@ -346,11 +175,11 @@ GEM capistrano-rbenv (2.2.0) capistrano (~> 3.1) sshkit (~> 1.3) - capistrano-sidekiq (2.0.0) + capistrano-sidekiq (2.3.1) capistrano (>= 3.9.0) capistrano-bundler sidekiq (>= 6.0) - capybara (3.36.0) + capybara (3.39.2) addressable matrix mini_mime (>= 0.1.3) @@ -359,7 +188,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - carrierwave (2.2.2) + carrierwave (2.2.5) activemodel (>= 5.0.0) activesupport (>= 5.0.0) addressable (~> 2.6) @@ -375,12 +204,12 @@ GEM cells-erb (0.1.0) cells (~> 4.0) erbse (>= 0.1.1) - cells-rails (0.0.9) - actionpack (>= 3.0) + cells-rails (0.1.5) + actionpack (>= 5.0) cells (>= 4.1.6, < 5.0.0) charlock_holmes (0.7.7) - chartkick (3.4.2) - chef-utils (17.9.52) + chartkick (4.2.1) + chef-utils (18.4.2) concurrent-ruby childprocess (3.0.0) coercible (1.0.0) @@ -392,76 +221,235 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.9) - connection_pool (2.2.5) - cookiejar (0.3.3) - crack (0.4.5) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + crack (1.0.0) + bigdecimal rexml crass (1.0.6) - css_parser (1.11.0) + css_parser (1.16.0) addressable + date (3.3.4) date_validator (0.9.0) activemodel activesupport - db-query-matchers (0.9.0) - activesupport (>= 4.0, <= 6.0) + db-query-matchers (0.10.0) + activesupport (>= 4.0, < 7) rspec (~> 3.0) - decidim-comparative_stats (1.1.0) - chartkick (~> 3.3) - decidim-admin (>= 0.23.0) - decidim-core (>= 0.23.0) - graphlient (~> 0.3) - jquery-tmpl-rails (~> 1.1) - decidim-decidim_awesome (0.7.2) - decidim-admin (>= 0.23.0, < 0.25) - decidim-core (>= 0.23.0, < 0.25) + decidim (0.25.2) + decidim-accountability (= 0.25.2) + decidim-admin (= 0.25.2) + decidim-api (= 0.25.2) + decidim-assemblies (= 0.25.2) + decidim-blogs (= 0.25.2) + decidim-budgets (= 0.25.2) + decidim-comments (= 0.25.2) + decidim-core (= 0.25.2) + decidim-debates (= 0.25.2) + decidim-forms (= 0.25.2) + decidim-generators (= 0.25.2) + decidim-meetings (= 0.25.2) + decidim-pages (= 0.25.2) + decidim-participatory_processes (= 0.25.2) + decidim-proposals (= 0.25.2) + decidim-sortitions (= 0.25.2) + decidim-surveys (= 0.25.2) + decidim-system (= 0.25.2) + decidim-templates (= 0.25.2) + decidim-verifications (= 0.25.2) + decidim-accountability (0.25.2) + decidim-comments (= 0.25.2) + decidim-core (= 0.25.2) + decidim-admin (0.25.2) + active_link_to (~> 1.0) + decidim-core (= 0.25.2) + devise (~> 4.7) + devise-i18n (~> 1.2) + devise_invitable (~> 2.0) + decidim-api (0.25.2) + graphql (~> 1.12, >= 1.12.3) + rack-cors (~> 1.0) + redcarpet (~> 3.5, >= 3.5.1) + decidim-assemblies (0.25.2) + decidim-core (= 0.25.2) + decidim-blogs (0.25.2) + decidim-admin (= 0.25.2) + decidim-comments (= 0.25.2) + decidim-core (= 0.25.2) + decidim-budgets (0.25.2) + decidim-comments (= 0.25.2) + decidim-core (= 0.25.2) + decidim-comments (0.25.2) + decidim-core (= 0.25.2) + redcarpet (~> 3.5, >= 3.5.1) + decidim-conferences (0.25.2) + decidim-core (= 0.25.2) + decidim-meetings (= 0.25.2) + wicked_pdf (~> 2.1) + wkhtmltopdf-binary (~> 0.12) + decidim-consultations (0.25.2) + decidim-admin (= 0.25.2) + decidim-comments (= 0.25.2) + decidim-core (= 0.25.2) + decidim-core (0.25.2) + active_link_to (~> 1.0) + acts_as_list (~> 0.9) + anchored (~> 1.1) + batch-loader (~> 1.2) + browser (~> 2.7) + carrierwave (~> 2.2.1) + cells-erb (~> 0.1.0) + cells-rails (~> 0.1.3) + charlock_holmes (~> 0.7) + date_validator (~> 0.9.0) + decidim-api (= 0.25.2) + devise (~> 4.7) + devise-i18n (~> 1.2) + diffy (~> 3.3) + doorkeeper (~> 5.1) + doorkeeper-i18n (~> 4.0) + etherpad-lite (~> 0.3) + file_validators (~> 2.1) + fog-local (~> 0.6) + foundation_rails_helper + geocoder (~> 1.5) + hashdiff (>= 0.4.0, < 2.0.0) + invisible_captcha (~> 0.12) + kaminari (~> 1.2, >= 1.2.1) + loofah (~> 2.3.1) + mini_magick (~> 4.9) + mustache (~> 1.1.0) + nobspw (~> 0.6.0) + omniauth (~> 2.0) + omniauth-facebook (~> 5.0) + omniauth-google-oauth2 (~> 1.0) + omniauth-rails_csrf_protection (~> 1.0) + omniauth-twitter (~> 1.4) + paper_trail (~> 10.3) + pg (~> 1.1.4, < 2) + pg_search (~> 2.2) + premailer-rails (~> 1.10) + rack (~> 2.2, >= 2.2.3) + rack-attack (~> 6.0) + rails (~> 6.0.4) + rails-i18n (~> 6.0) + ransack (~> 2.4.1) + rectify (~> 0.13.0) + redis (~> 4.1) + request_store (~> 1.5.0) + rubyXL (~> 3.4) + rubyzip (~> 2.0) + searchlight (~> 4.1) + seven_zip_ruby (~> 1.3) + social-share-button (~> 1.2, >= 1.2.1) + truncato (~> 0.7) + valid_email2 (~> 2.1) + webpacker (= 6.0.0.rc.5) + wisper (~> 2.0) + decidim-debates (0.25.2) + decidim-comments (= 0.25.2) + decidim-core (= 0.25.2) + decidim-decidim_awesome (0.8.3) + decidim-admin (>= 0.25.0, < 0.27) + decidim-core (>= 0.25.0, < 0.27) sassc (~> 2.3) - decidim-direct_verifications (0.22.1) - decidim-admin (>= 0.22.0) - decidim-core (>= 0.22.0) - decidim-navigation_maps (1.2.0) - decidim-admin (>= 0.24, < 0.25) - decidim-core (>= 0.24, < 0.25) - decidim-notify (0.4) - decidim-admin (>= 0.21) - decidim-core (>= 0.21) + decidim-dev (0.25.2) + axe-core-rspec (~> 4.1.0) + byebug (~> 11.0) + capybara (~> 3.24) + db-query-matchers (~> 0.10.0) + decidim (= 0.25.2) + erb_lint (~> 0.0.35) + factory_bot_rails (~> 4.8) + i18n-tasks (~> 0.9.18) + mdl (~> 0.5) + nokogiri (~> 1.11, >= 1.11.4) + puma (~> 5.0) + rails-controller-testing (~> 1.0) + rspec-cells (~> 0.3.4) + rspec-html-matchers (~> 0.9.1) + rspec-rails (~> 4.0) + rspec-retry (~> 0.6.2) + rspec_junit_formatter (~> 0.3.0) + rubocop (~> 0.92.0) + rubocop-rails (~> 2.8) + rubocop-rspec (= 1.43.2) + selenium-webdriver (~> 3.142) + simplecov (~> 0.19.0) + simplecov-cobertura (~> 1.3.1) + system_test_html_screenshots (~> 0.2) + w3c_rspec_validators (~> 0.3.0) + webmock (~> 3.6) + wisper-rspec (~> 1.0) + decidim-forms (0.25.2) + decidim-core (= 0.25.2) + wicked_pdf (~> 2.1) + wkhtmltopdf-binary (~> 0.12) + decidim-generators (0.25.2) + decidim-core (= 0.25.2) + decidim-meetings (0.25.2) + decidim-core (= 0.25.2) + decidim-forms (= 0.25.2) + icalendar (~> 2.5) + decidim-notify (0.5) + decidim-admin (>= 0.25) + decidim-core (>= 0.25) + decidim-pages (0.25.2) + decidim-core (= 0.25.2) + decidim-participatory_processes (0.25.2) + decidim-core (= 0.25.2) + decidim-proposals (0.25.2) + decidim-comments (= 0.25.2) + decidim-core (= 0.25.2) + doc2text (~> 0.4.3) + redcarpet (~> 3.5, >= 3.5.1) + decidim-sortitions (0.25.2) + decidim-admin (= 0.25.2) + decidim-comments (= 0.25.2) + decidim-core (= 0.25.2) + decidim-proposals (= 0.25.2) + decidim-surveys (0.25.2) + decidim-core (= 0.25.2) + decidim-forms (= 0.25.2) + decidim-templates (= 0.25.2) + decidim-system (0.25.2) + active_link_to (~> 1.0) + decidim-core (= 0.25.2) + devise (~> 4.7) + devise-i18n (~> 1.2) + devise_invitable (~> 2.0) + decidim-templates (0.25.2) + decidim-core (= 0.25.2) + decidim-forms (= 0.25.2) + decidim-verifications (0.25.2) + decidim-core (= 0.25.2) declarative-builder (0.1.0) declarative-option (< 0.2.0) declarative-option (0.1.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.8.1) + devise (4.9.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-i18n (1.10.2) - devise (>= 4.8.0) - devise_invitable (1.7.5) - actionmailer (>= 4.1.0) - devise (>= 4.0.0) - diff-lcs (1.5.0) - diffy (3.4.0) - doc2text (0.4.5) - nokogiri (>= 1.13.2, < 1.14.0) + devise-i18n (1.12.0) + devise (>= 4.9.0) + devise_invitable (2.0.9) + actionmailer (>= 5.0) + devise (>= 4.6) + diff-lcs (1.5.1) + diffy (3.4.2) + doc2text (0.4.7) + nokogiri (>= 1.13.2, < 1.17.0) rubyzip (~> 2.3.0) docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.5.4) + domain_name (0.6.20240107) + doorkeeper (5.6.9) railties (>= 5) doorkeeper-i18n (4.0.1) - em-http-request (1.1.7) - addressable (>= 2.3.4) - cookiejar (!= 0.3.1) - em-socksify (>= 0.3) - eventmachine (>= 1.0.3) - http_parser.rb (>= 0.6.0) - em-socksify (0.3.2) - eventmachine (>= 1.0.0.beta.4) - em-synchrony (1.0.6) - eventmachine (>= 1.0.0.beta.1) + dumb_delegator (1.0.0) equalizer (0.0.11) erb_lint (0.0.37) activesupport @@ -473,61 +461,39 @@ GEM smart_properties erbse (0.1.4) temple - erubi (1.10.0) - et-orbi (1.2.6) + erubi (1.12.0) + et-orbi (1.2.9) tzinfo - etherpad-lite (0.3.0) + etherpad-lite (0.3.1) rest-client (>= 1.6) - eventmachine (1.2.7) - eventmachine_httpserver (0.2.1) - excon (0.91.0) - execjs (2.8.1) + excon (0.110.0) + execjs (2.9.1) factory_bot (4.11.1) activesupport (>= 3.0.0) factory_bot_rails (4.11.1) factory_bot (~> 4.11.1) railties (>= 3.0.0) - faker (2.19.0) - i18n (>= 1.6, < 2) - faraday (1.10.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) + faker (2.23.0) + i18n (>= 1.8.11, < 2) + faraday (2.8.1) + base64 + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.0) - faraday (~> 1.0) - ffi (1.15.5) + faraday-net_http (3.0.2) + ffi (1.16.3) figaro (1.2.0) thor (>= 0.14.0, < 2) file_validators (2.3.0) activemodel (>= 3.2) mime-types (>= 1.0) - fog-aws (3.13.0) + fog-aws (3.21.1) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) - fog-core (2.2.4) + fog-core (2.4.0) builder excon (~> 0.71) - formatador (~> 0.2) + formatador (>= 0.2, < 2.0) mime-types fog-json (1.2.0) fog-core @@ -537,46 +503,32 @@ GEM fog-xml (0.1.4) fog-core nokogiri (>= 1.5.11, < 2.0.0) - formatador (0.3.0) - foundation-rails (6.6.2.0) - railties (>= 3.1.0) - sass (>= 3.3.0) - sprockets-es6 (>= 0.9.0) - foundation_rails_helper (3.0.0) - actionpack (>= 4.1, < 6.0) - activemodel (>= 4.1, < 6.0) - activesupport (>= 4.1, < 6.0) - railties (>= 4.1, < 6.0) - tzinfo (~> 1.2, >= 1.2.2) - fugit (1.5.2) - et-orbi (~> 1.1, >= 1.1.8) + formatador (1.1.0) + foundation_rails_helper (4.0.1) + actionpack (>= 4.1, < 7.1) + activemodel (>= 4.1, < 7.1) + activesupport (>= 4.1, < 7.1) + railties (>= 4.1, < 7.1) + fugit (1.10.1) + et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) - geocoder (1.7.3) - globalid (1.0.0) + geocoder (1.8.2) + globalid (1.1.0) activesupport (>= 5.0) - graphiql-rails (1.4.11) - railties - sprockets-rails - graphlient (0.5.0) - faraday (>= 1.0) - faraday_middleware - graphql-client - graphql (1.13.10) - graphql-client (0.17.0) - activesupport (>= 3.0) - graphql (~> 1.10) - hashdiff (1.0.1) + graphlient (0.0.5) + graphql (1.13.22) + base64 + hashdiff (1.1.0) hashie (5.0.0) health_check (3.1.0) railties (>= 5.0) - highline (2.0.3) + highline (2.1.0) html_tokenizer (0.0.7) htmlentities (4.3.4) http-accept (1.7.0) - http-cookie (1.0.4) + http-cookie (1.0.5) domain_name (~> 0.5) - http_parser.rb (0.6.0) - i18n (1.10.0) + i18n (1.14.4) concurrent-ruby (~> 1.0) i18n-tasks (0.9.37) activesupport (>= 4.0.2) @@ -588,24 +540,18 @@ GEM rails-i18n rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) - icalendar (2.7.1) + icalendar (2.10.1) ice_cube (~> 0.16) ice_cube (0.16.4) ice_nine (0.11.2) - image_processing (1.12.1) + image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) invisible_captcha (0.13.0) rails (>= 3.2.0) - jquery-rails (4.4.0) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - jquery-slick-rails (1.10.0) - railties (>= 3.1) - jquery-tmpl-rails (1.1.0) - rails (>= 3.1.0) - jwt (2.3.0) + json (2.7.1) + jwt (2.8.1) + base64 kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -618,89 +564,108 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kramdown (2.3.1) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - launchy (2.5.0) - addressable (~> 2.7) - letter_opener (1.7.0) - launchy (~> 2.2) + launchy (2.5.2) + addressable (~> 2.8) + letter_opener (1.9.0) + launchy (>= 2.2, < 3) letter_opener_web (1.4.1) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - listen (3.7.1) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.1) + mail (2.8.1) mini_mime (>= 0.1.1) - marcel (1.0.2) + net-imap + net-pop + net-smtp + marcel (1.0.4) matrix (0.4.2) - mdl (0.11.0) + mdl (0.13.0) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1) mixlib-cli (~> 2.1, >= 2.1.1) mixlib-config (>= 2.2.1, < 4) mixlib-shellout method_source (1.0.0) - mime-types (3.4.1) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - mini_magick (4.11.0) - mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.15.0) + mime-types-data (3.2024.0305) + mini_magick (4.12.0) + mini_mime (1.1.5) + mini_portile2 (2.8.5) + minitest (5.22.3) mixlib-cli (2.1.8) - mixlib-config (3.0.9) + mixlib-config (3.0.27) tomlrb - mixlib-shellout (3.2.5) + mixlib-shellout (3.2.7) chef-utils - msgpack (1.4.5) + msgpack (1.7.2) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.1.1) mustache (1.1.1) - net-scp (3.0.0) - net-ssh (>= 2.6.5, < 7.0.0) - net-ssh (6.1.0) + mutex_m (0.2.0) + net-imap (0.4.10) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) + net-smtp (0.4.0.1) + net-protocol + net-ssh (7.2.1) netrc (0.11.0) - nio4r (2.5.8) + nio4r (2.7.0) nobspw (0.6.2) - nokogiri (1.13.3) - mini_portile2 (~> 2.8.0) - racc (~> 1.4) - nokogiri (1.13.3-x86_64-linux) + nokogiri (1.15.5) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - oauth (0.5.8) - oauth2 (1.4.9) + oauth (1.1.0) + oauth-tty (~> 1.0, >= 1.0.1) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + oauth-tty (1.0.5) + version_gem (~> 1.1, >= 1.1.1) + oauth2 (2.0.9) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) - omniauth (1.9.1) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + omniauth (2.1.2) hashie (>= 3.4.6) - rack (>= 1.6.2, < 3) + rack (>= 2.2.3) + rack-protection omniauth-facebook (5.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.8.2) + omniauth-google-oauth2 (1.1.1) jwt (>= 2.0) - oauth2 (~> 1.1) - omniauth (~> 1.1) - omniauth-oauth2 (>= 1.6) + oauth2 (~> 2.0.6) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.8.0) omniauth-oauth (1.2.0) oauth omniauth (>= 1.0, < 3) - omniauth-oauth2 (1.7.2) - oauth2 (~> 1.4) - omniauth (>= 1.9, < 3) - omniauth-rails_csrf_protection (0.1.2) + omniauth-oauth2 (1.8.0) + oauth2 (>= 1.4, < 3) + omniauth (~> 2.0) + omniauth-rails_csrf_protection (1.0.1) actionpack (>= 4.2) - omniauth (>= 1.3.1) + omniauth (~> 2.0) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack @@ -708,79 +673,80 @@ GEM paper_trail (10.3.1) activerecord (>= 4.2) request_store (~> 1.1) - parallel (1.21.0) - parser (3.1.1.0) + parallel (1.24.0) + parser (3.3.0.5) ast (~> 2.4.1) + racc pg (1.1.4) pg_search (2.3.6) activerecord (>= 5.2) activesupport (>= 5.2) - premailer (1.15.0) + premailer (1.22.0) addressable - css_parser (>= 1.6.0) + css_parser (>= 1.12.0) htmlentities (>= 4.0.0) - premailer-rails (1.11.1) + premailer-rails (1.12.0) actionmailer (>= 3) + net-smtp premailer (~> 1.7, >= 1.7.9) - public_suffix (4.0.6) - puffing-billy (2.4.1) - addressable (~> 2.5) - em-http-request (~> 1.1, >= 1.1.0) - em-synchrony - eventmachine (~> 1.2) - eventmachine_httpserver - http_parser.rb (~> 0.6.0) - multi_json - puma (5.6.2) + public_suffix (5.0.4) + puma (5.6.8) nio4r (~> 2.0) raabro (1.4.0) - racc (1.6.0) - rack (2.2.3) - rack-attack (6.6.0) - rack (>= 1.0, < 3) + racc (1.7.3) + rack (2.2.8.1) + rack-attack (6.7.0) + rack (>= 1.0, < 4) rack-cors (1.1.1) rack (>= 2.0.0) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.2.6.2) - actioncable (= 5.2.6.2) - actionmailer (= 5.2.6.2) - actionpack (= 5.2.6.2) - actionview (= 5.2.6.2) - activejob (= 5.2.6.2) - activemodel (= 5.2.6.2) - activerecord (= 5.2.6.2) - activestorage (= 5.2.6.2) - activesupport (= 5.2.6.2) + rack-protection (3.2.0) + base64 (>= 0.1.0) + rack (~> 2.2, >= 2.2.4) + rack-proxy (0.7.7) + rack + rack-test (2.1.0) + rack (>= 1.3) + rails (6.0.6.1) + actioncable (= 6.0.6.1) + actionmailbox (= 6.0.6.1) + actionmailer (= 6.0.6.1) + actionpack (= 6.0.6.1) + actiontext (= 6.0.6.1) + actionview (= 6.0.6.1) + activejob (= 6.0.6.1) + activemodel (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) bundler (>= 1.3.0) - railties (= 5.2.6.2) + railties (= 6.0.6.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) - rails-i18n (5.1.3) + rails-i18n (6.0.0) i18n (>= 0.7, < 2) - railties (>= 5.0, < 6) - railties (5.2.6.2) - actionpack (= 5.2.6.2) - activesupport (= 5.2.6.2) + railties (>= 6.0.0, < 7) + railties (6.0.6.1) + actionpack (= 6.0.6.1) + activesupport (= 6.0.6.1) method_source rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + thor (>= 0.20.3, < 2.0) rainbow (3.1.1) - rake (13.0.6) - ransack (2.1.1) - actionpack (>= 5.0) - activerecord (>= 5.0) - activesupport (>= 5.0) + rake (13.1.0) + ransack (2.4.2) + activerecord (>= 5.2.4) + activesupport (>= 5.2.4) i18n - rb-fsevent (0.11.1) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rectify (0.13.0) @@ -789,49 +755,49 @@ GEM activesupport (>= 4.1.0) virtus (~> 1.0.5) wisper (>= 1.6.1) - redcarpet (3.5.1) - redis (4.6.0) - regexp_parser (2.2.1) + redcarpet (3.6.0) + redis (4.8.1) + regexp_parser (2.9.0) request_store (1.5.1) rack (>= 1.4) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) + responders (3.1.1) + actionpack (>= 5.2) + railties (>= 5.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.5) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-cells (0.3.7) + rexml (3.2.6) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-cells (0.3.9) cells (>= 4.0.0, < 6.0.0) - rspec-rails (< 6.0) - rspec-core (3.9.3) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.4) + rspec-rails (>= 3.0.0, < 6.2.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) + rspec-support (~> 3.13.0) rspec-html-matchers (0.9.4) nokogiri (~> 1) rspec (>= 3.0.0.a, < 4) - rspec-mocks (3.9.1) + rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-rails (3.9.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-support (~> 3.9.0) + rspec-support (~> 3.13.0) + rspec-rails (4.1.2) + actionpack (>= 4.2) + activesupport (>= 4.2) + railties (>= 4.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.9.4) + rspec-support (3.13.1) rspec_junit_formatter (0.3.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (0.92.0) @@ -843,8 +809,8 @@ GEM rubocop-ast (>= 0.5.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.16.0) - parser (>= 3.1.1.0) + rubocop-ast (1.31.2) + parser (>= 3.3.0.4) rubocop-faker (1.1.0) faker (>= 2.12.0) rubocop (>= 0.82.0) @@ -852,111 +818,105 @@ GEM activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 0.90.0, < 2.0) - rubocop-rspec (1.44.1) + rubocop-rspec (1.43.2) rubocop (~> 0.87) - rubocop-ast (>= 0.7.1) - ruby-ole (1.2.12.2) - ruby-progressbar (1.11.0) - ruby-vips (2.1.4) + ruby-progressbar (1.13.0) + ruby-vips (2.2.1) ffi (~> 1.12) ruby2_keywords (0.0.5) + rubyXL (3.4.25) + nokogiri (>= 1.10.8) + rubyzip (>= 1.3.0) rubyzip (2.3.2) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) sassc (2.4.0) ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt searchlight (4.1.0) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sentry-rails (5.1.0) + semantic_range (3.0.0) + sentry-rails (5.17.0) railties (>= 5.0) - sentry-ruby-core (~> 5.1.0) - sentry-ruby (5.1.0) + sentry-ruby (~> 5.17.0) + sentry-ruby (5.17.0) + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - sentry-ruby-core (= 5.1.0) - sentry-ruby-core (5.1.0) - concurrent-ruby seven_zip_ruby (1.3.0) - sidekiq (6.4.1) - connection_pool (>= 2.2.2) + sidekiq (6.5.12) + connection_pool (>= 2.2.5, < 3) rack (~> 2.0) - redis (>= 4.2.0) - sidekiq-cron (1.2.0) - fugit (~> 1.1) - sidekiq (>= 4.2.1) + redis (>= 4.5.0, < 5) + sidekiq-cron (1.12.0) + fugit (~> 1.8) + globalid (>= 1.0.1) + sidekiq (>= 6) simplecov (0.19.1) docile (~> 1.1) simplecov-html (~> 0.11) simplecov-cobertura (1.3.1) simplecov (~> 0.8) simplecov-html (0.12.3) - simplemde-rails (1.11.2) smart_properties (1.17.0) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) social-share-button (1.2.4) coffee-rails - spreadsheet (1.3.0) - ruby-ole - spring (2.1.1) - spring-watcher-listen (2.0.1) + spring (4.1.3) + spring-watcher-listen (2.1.0) listen (>= 2.7, < 4.0) - spring (>= 1.2, < 3.0) - sprockets (3.7.2) + spring (>= 4) + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-es6 (0.9.2) - babel-source (>= 5.8.11) - babel-transpiler - sprockets (>= 3.0.0) + rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sshkit (1.21.2) + sshkit (1.22.0) + mutex_m net-scp (>= 1.1.2) + net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) sshkit-interactive (0.3.0) sshkit (~> 1.12) - ssrf_filter (1.0.7) - system_test_html_screenshots (0.1.2) - actionpack (>= 5.2, < 6.0.a) - temple (0.8.2) + ssrf_filter (1.1.2) + system_test_html_screenshots (0.2.0) + actionpack (>= 5.2, < 6.1.a) + temple (0.10.3) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.1) + thor (1.3.1) thread_safe (0.3.6) - tilt (2.0.10) - tomlrb (2.0.1) - truncato (0.7.11) + tilt (2.3.0) + timeout (0.4.1) + tomlrb (2.0.3) + truncato (0.7.12) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) - tzinfo (1.2.9) + tzinfo (1.2.11) thread_safe (~> 0.1) uber (0.1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.8) unicode-display_width (1.8.0) valid_email2 (2.3.1) activemodel (>= 3.2) mail (~> 2.5) - vcr (6.0.0) + version_gem (1.1.3) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) + w3c_rspec_validators (0.3.0) + rails + rspec + w3c_validators + w3c_validators (1.3.7) + json (>= 1.8) + nokogiri (~> 1.6) + rexml (~> 3.2) warden (1.2.9) rack (>= 2.0.9) web-console (3.7.0) @@ -964,24 +924,29 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webmock (3.14.0) + webmock (3.23.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.5) + webpacker (6.0.0.rc.5) + activesupport (>= 5.2) + rack-proxy (>= 0.6.1) + railties (>= 5.2) + semantic_range (>= 2.3.0) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - wicked_pdf (1.4.0) + wicked_pdf (2.8.0) activesupport wisper (2.0.1) wisper-rspec (1.1.0) - wkhtmltopdf-binary (0.12.6.5) + wkhtmltopdf-binary (0.12.6.6) xpath (3.2.0) nokogiri (~> 1.8) + zeitwerk (2.6.13) PLATFORMS ruby - x86_64-linux DEPENDENCIES bootsnap (~> 1.4) @@ -993,43 +958,40 @@ DEPENDENCIES capistrano-rails-console capistrano-rbenv capistrano-sidekiq - decidim! + decidim (~> 0.25.0) decidim-alternative_landing! - decidim-comparative_stats (~> 1.1.0) - decidim-conferences! - decidim-consultations! - decidim-decidim_awesome (~> 0.7.2) - decidim-dev! - decidim-direct_verifications (~> 0.22) - decidim-navigation_maps (~> 1.2.0) - decidim-notify (~> 0.4.0) - decidim-templates! + decidim-comparative_stats! + decidim-conferences (~> 0.25.0) + decidim-consultations (~> 0.25.0) + decidim-decidim_awesome (~> 0.8) + decidim-dev (~> 0.25.0) + decidim-direct_verifications! + decidim-navigation_maps! + decidim-notify (~> 0.5) + decidim-templates (~> 0.25.0) decidim-term_customizer! decidim-time_tracker! faker (~> 2.14) figaro (~> 1.2) fog-aws health_check - jquery-slick-rails letter_opener_web (~> 1.3) listen (~> 3.1) puma (>= 5.0.0) - redcarpet - rspec + rspec (~> 3.10) rubocop-faker sentry-rails sentry-ruby sidekiq (~> 6.0) sidekiq-cron - simplemde-rails - spring (~> 2.0) - spring-watcher-listen (~> 2.0) + spring (~> 4.0) + spring-watcher-listen (~> 2.1) uglifier (~> 4.1) web-console (~> 3.5) - wicked_pdf (~> 1.4) + wicked_pdf (~> 2.1) RUBY VERSION - ruby 2.7.4p191 + ruby 2.7.5p203 BUNDLED WITH - 2.2.33 + 2.1.4 diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js deleted file mode 100644 index f01fbd6..0000000 --- a/app/assets/config/manifest.js +++ /dev/null @@ -1,4 +0,0 @@ -//= link_tree ../images -//= link_directory ../javascripts .js -//= link_directory ../stylesheets .css -//= link decidim/forms/admin/collapsible_questions.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js deleted file mode 100644 index 0996852..0000000 --- a/app/assets/javascripts/application.js +++ /dev/null @@ -1,17 +0,0 @@ -// This is a manifest file that'll be compiled into application.js, which will include all the files -// listed below. -// -// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's -// vendor/assets/javascripts directory can be referenced here using a relative path. -// -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// compiled file. JavaScript code in this file should be added after the last require_* statement. -// -// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details -// about supported directives. -// -//= require rails-ujs -//= require activestorage -//= require decidim -//= require decidim/alternative_landing/alternative_landing -//= require_tree ./oh/partials diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js deleted file mode 100644 index 739aa5f..0000000 --- a/app/assets/javascripts/cable.js +++ /dev/null @@ -1,13 +0,0 @@ -// Action Cable provides the framework to deal with WebSockets in Rails. -// You can generate new channels where WebSocket features live using the `rails generate channel` command. -// -//= require action_cable -//= require_self -//= require_tree ./channels - -(function() { - this.App || (this.App = {}); - - App.cable = ActionCable.createConsumer(); - -}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss deleted file mode 100644 index aa40520..0000000 --- a/app/assets/stylesheets/application.scss +++ /dev/null @@ -1,17 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's - * vendor/assets/stylesheets directory can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS - * files in this directory. Styles in this file should be added after the last require_* statement. - * It is generally better to create a new file per style scope. - * - *= require decidim - *= require decidim/alternative_landing/alternative_landing - *= require_tree ./oh/partials - *= require_self - */ diff --git a/app/assets/stylesheets/decidim.scss b/app/assets/stylesheets/decidim.scss deleted file mode 100644 index 316bbe4..0000000 --- a/app/assets/stylesheets/decidim.scss +++ /dev/null @@ -1,19 +0,0 @@ -// Variables -// -// $primary: #ef604d; -// $secondary: #599aa6; -// $success: #57d685; -// $warning: #ffae00; -// $alert: #ec5840; -// -// $proposals: #238ff7; -// $actions: #57d685; -// $debates: #fa6c96; -// $meetings: #fabc6c; -// -// $twitter: #55acee; -// $facebook: #3b5998; -// $google: #dd4b39; - -@import "oh/partials/variables"; -@import "decidim/application"; diff --git a/app/assets/stylesheets/oh/survey_hacks/timetracker.scss b/app/assets/stylesheets/oh/survey_hacks/timetracker.scss deleted file mode 100644 index fd12520..0000000 --- a/app/assets/stylesheets/oh/survey_hacks/timetracker.scss +++ /dev/null @@ -1,3 +0,0 @@ -/* -*= require jquery-clockpicker -*/ \ No newline at end of file diff --git a/app/packs/entrypoints/application.js b/app/packs/entrypoints/application.js new file mode 100644 index 0000000..fc8ab3b --- /dev/null +++ b/app/packs/entrypoints/application.js @@ -0,0 +1,19 @@ +/* eslint no-console:0 */ +// This file is automatically compiled by Webpack, along with any other files +// present in this directory. You're encouraged to place your actual application logic in +// a relevant structure within app/packs and only use these pack files to reference +// that code so it'll be compiled. +// +// To reference this file, add <%= javascript_pack_tag 'application' %> to the appropriate +// layout file, like app/views/layouts/application.html.erb + +// Uncomment to copy all static images under ../images to the output folder and reference +// them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>) +// or the `imagePath` JavaScript helper below. +// +// const images = require.context('../images', true) +// const imagePath = (name) => images(name, true) + +// Activate Active Storage +// import * as ActiveStorage from "@rails/activestorage" +// ActiveStorage.start() diff --git a/app/packs/entrypoints/decidim_openheritage_email.scss b/app/packs/entrypoints/decidim_openheritage_email.scss new file mode 100644 index 0000000..20aea20 --- /dev/null +++ b/app/packs/entrypoints/decidim_openheritage_email.scss @@ -0,0 +1,2 @@ + +@import "stylesheets/email.scss"; \ No newline at end of file diff --git a/app/packs/entrypoints/decidim_openheritage_timetracker.js b/app/packs/entrypoints/decidim_openheritage_timetracker.js new file mode 100644 index 0000000..c0468fb --- /dev/null +++ b/app/packs/entrypoints/decidim_openheritage_timetracker.js @@ -0,0 +1,3 @@ +import "src/oh/survey_hacks/timetracker.js"; +// CSS for compiling +import "stylesheets/oh/survey_hacks/timetracker.scss"; \ No newline at end of file diff --git a/app/assets/images/openheritage/europe-flag.png b/app/packs/images/openheritage/europe-flag.png similarity index 100% rename from app/assets/images/openheritage/europe-flag.png rename to app/packs/images/openheritage/europe-flag.png diff --git a/app/assets/images/openheritage/oh-logo-white.jpg b/app/packs/images/openheritage/oh-logo-white.jpg similarity index 100% rename from app/assets/images/openheritage/oh-logo-white.jpg rename to app/packs/images/openheritage/oh-logo-white.jpg diff --git a/app/assets/images/.keep b/app/packs/src/channels/.keep similarity index 100% rename from app/assets/images/.keep rename to app/packs/src/channels/.keep diff --git a/app/packs/src/decidim/decidim_application.js b/app/packs/src/decidim/decidim_application.js new file mode 100644 index 0000000..50cb64f --- /dev/null +++ b/app/packs/src/decidim/decidim_application.js @@ -0,0 +1,11 @@ +// This file is compiled inside Decidim core pack. Code can be added here and will be executed +// as part of that pack + +// Load images +require.context("../../images", true) +require("slick-carousel") + +import "slick-carousel/slick/slick.scss" +import "slick-carousel/slick/slick-theme.scss" +import "../oh/survey_hacks/timetracker" + diff --git a/app/assets/javascripts/oh/partials/_galleries.js b/app/packs/src/oh/partials/_galleries.js similarity index 90% rename from app/assets/javascripts/oh/partials/_galleries.js rename to app/packs/src/oh/partials/_galleries.js index 0cae899..c57fa23 100644 --- a/app/assets/javascripts/oh/partials/_galleries.js +++ b/app/packs/src/oh/partials/_galleries.js @@ -1,4 +1,4 @@ -//= require jquery.slick +import 'slick-carousel'; $(document).ready(function(){ $('.proposals-gallery').slick({ diff --git a/app/assets/javascripts/oh/survey_hacks/timetracker.js b/app/packs/src/oh/survey_hacks/timetracker.js similarity index 93% rename from app/assets/javascripts/oh/survey_hacks/timetracker.js rename to app/packs/src/oh/survey_hacks/timetracker.js index adda03e..a141c17 100644 --- a/app/assets/javascripts/oh/survey_hacks/timetracker.js +++ b/app/packs/src/oh/survey_hacks/timetracker.js @@ -1,4 +1,4 @@ -//= require jquery-clockpicker.js +import 'clockpicker/dist/jquery-clockpicker.js'; $(document).ready(function(){ var user = $('li>a[href="/account"]').first().text() diff --git a/app/packs/stylesheets/decidim/_decidim-settings.scss b/app/packs/stylesheets/decidim/_decidim-settings.scss new file mode 100644 index 0000000..b4b7a47 --- /dev/null +++ b/app/packs/stylesheets/decidim/_decidim-settings.scss @@ -0,0 +1,9 @@ +// This is a file that can be overridden by the application in order to override +// some of the Foundation/Decidim SCSS settings and variables after the default +// settings have been loaded. +// +// To override styles use decidim_application.scss +// +// By default this is empty. + + diff --git a/app/packs/stylesheets/decidim/decidim_application.scss b/app/packs/stylesheets/decidim/decidim_application.scss new file mode 100644 index 0000000..a0db0a5 --- /dev/null +++ b/app/packs/stylesheets/decidim/decidim_application.scss @@ -0,0 +1,10 @@ +// This is a file that can be overridden by the application in order to override styles +// Notice that this file is included at the very end of the stylesheets packs to have +// more priority +// +// To override CSS variables or Foundation settings use _decidim-settings.scss +// +// By default this is empty. + +@import "stylesheets/oh"; + diff --git a/app/assets/stylesheets/decidim/email.css b/app/packs/stylesheets/email.scss similarity index 84% rename from app/assets/stylesheets/decidim/email.css rename to app/packs/stylesheets/email.scss index df78b8f..32f61c9 100644 --- a/app/assets/stylesheets/decidim/email.css +++ b/app/packs/stylesheets/email.scss @@ -26,13 +26,13 @@ body { .ExternalClass { width: 100%; } - .ExternalClass, - .ExternalClass p, - .ExternalClass span, - .ExternalClass font, - .ExternalClass td, - .ExternalClass div { - line-height: 100%; } +.ExternalClass, +.ExternalClass p, +.ExternalClass span, +.ExternalClass font, +.ExternalClass td, +.ExternalClass div { + line-height: 100%; } #backgroundTable { margin: 0; @@ -100,8 +100,8 @@ table.row { table.spacer { width: 100%; } - table.spacer td { - mso-line-height-rule: exactly; } +table.spacer td { + mso-line-height-rule: exactly; } table.container table.row { display: table; } @@ -114,25 +114,25 @@ th.column { Margin: 0 auto; padding-left: 16px; padding-bottom: 16px; } - td.columns .column, - td.columns .columns, - td.column .column, - td.column .columns, - th.columns .column, - th.columns .columns, - th.column .column, - th.column .columns { - padding-left: 0 !important; - padding-right: 0 !important; } - td.columns .column center, - td.columns .columns center, - td.column .column center, - td.column .columns center, - th.columns .column center, - th.columns .columns center, - th.column .column center, - th.column .columns center { - min-width: none !important; } +td.columns .column, +td.columns .columns, +td.column .column, +td.column .columns, +th.columns .column, +th.columns .columns, +th.column .column, +th.column .columns { + padding-left: 0 !important; + padding-right: 0 !important; } +td.columns .column center, +td.columns .columns center, +td.column .column center, +td.column .columns center, +th.columns .column center, +th.columns .columns center, +th.column .column center, +th.column .columns center { + min-width: none !important; } td.columns.last, td.column.last, @@ -679,9 +679,9 @@ table.container.radius { .block-grid { width: 100%; max-width: 580px; } - .block-grid td { - display: inline-block; - padding: 8px; } +.block-grid td { + display: inline-block; + padding: 8px; } .up-2 td { width: 274px !important; } @@ -797,14 +797,14 @@ th.float-right { font-size: 0; width: 0; line-height: 0; } - @media only screen and (max-width: 596px) { - .hide-for-large { - display: block !important; - width: auto !important; - overflow: visible !important; - max-height: none !important; - font-size: inherit !important; - line-height: inherit !important; } } +@media only screen and (max-width: 596px) { + .hide-for-large { + display: block !important; + width: auto !important; + overflow: visible !important; + max-height: none !important; + font-size: inherit !important; + line-height: inherit !important; } } table.body table.container .hide-for-large * { mso-hide: all; } @@ -890,17 +890,17 @@ th { p { margin-bottom: 10px; Margin-bottom: 10px; } - p.lead { - font-size: 20px; - line-height: 1.6; } - p.subheader { - margin-top: 4px; - margin-bottom: 8px; - Margin-top: 4px; - Margin-bottom: 8px; - font-weight: normal; - line-height: 1.4; - color: #8a8a8a; } +p.lead { + font-size: 20px; + line-height: 1.6; } +p.subheader { + margin-top: 4px; + margin-bottom: 8px; + Margin-top: 4px; + Margin-bottom: 8px; + font-weight: normal; + line-height: 1.4; + color: #8a8a8a; } small { font-size: 80%; @@ -909,12 +909,12 @@ small { a { color: #cd5360; text-decoration: none; } - a:hover { - color: #30415d; } - a:active { - color: #30415d; } - a:visited { - color: #cd5360; } +a:hover { + color: #30415d; } +a:active { + color: #30415d; } +a:visited { + color: #cd5360; } h1 a, h1 a:visited, @@ -934,34 +934,34 @@ pre { background: #f3f3f3; margin: 30px 0; Margin: 30px 0; } - pre code { - color: #cacaca; } - pre code span.callout { - color: #8a8a8a; - font-weight: bold; } - pre code span.callout-strong { - color: #ff6908; - font-weight: bold; } +pre code { + color: #cacaca; } +pre code span.callout { + color: #8a8a8a; + font-weight: bold; } +pre code span.callout-strong { + color: #ff6908; + font-weight: bold; } table.hr { width: 100%; } - table.hr th { - height: 0; - max-width: 580px; - border-top: 0; - border-right: 0; - border-bottom: 1px solid #0a0a0a; - border-left: 0; - margin: 20px auto; - Margin: 20px auto; - clear: both; } +table.hr th { + height: 0; + max-width: 580px; + border-top: 0; + border-right: 0; + border-bottom: 1px solid #0a0a0a; + border-left: 0; + margin: 20px auto; + Margin: 20px auto; + clear: both; } .stat { font-size: 40px; line-height: 1; } - p + .stat { - margin-top: -16px; - Margin-top: -16px; } +p + .stat { + margin-top: -16px; + Margin-top: -16px; } span.preheader { display: none !important; @@ -979,27 +979,27 @@ table.button { width: auto; margin: 0 0 16px 0; Margin: 0 0 16px 0; } - table.button table td { - text-align: left; - color: #fefefe; - background: #c24b29; - border: 2px solid #c24b29; } - table.button table td a { - font-family: Helvetica, Arial, sans-serif; - font-size: 16px; - font-weight: bold; - color: #fefefe; - text-decoration: none; - display: inline-block; - padding: 8px 16px 8px 16px; - border: 0 solid #c24b29; - border-radius: 3px; } - table.button.radius table td { - border-radius: 3px; - border: none; } - table.button.rounded table td { - border-radius: 500px; - border: none; } +table.button table td { + text-align: left; + color: #fefefe; + background: #c24b29; + border: 2px solid #c24b29; } +table.button table td a { + font-family: Helvetica, Arial, sans-serif; + font-size: 16px; + font-weight: bold; + color: #fefefe; + text-decoration: none; + display: inline-block; + padding: 8px 16px 8px 16px; + border: 0 solid #c24b29; + border-radius: 3px; } +table.button.radius table td { + border-radius: 3px; + border: none; } +table.button.rounded table td { + border-radius: 500px; + border: none; } table.button:hover table tr td a, table.button:active table tr td a, @@ -1035,18 +1035,18 @@ table.button.large table a { table.button.expand, table.button.expanded { width: 100% !important; } - table.button.expand table, - table.button.expanded table { - width: 100%; } - table.button.expand table a, - table.button.expanded table a { - text-align: center; - width: 100%; - padding-left: 0; - padding-right: 0; } - table.button.expand center, - table.button.expanded center { - min-width: 0; } +table.button.expand table, +table.button.expanded table { + width: 100%; } +table.button.expand table a, +table.button.expanded table a { + text-align: center; + width: 100%; + padding-left: 0; + padding-right: 0; } +table.button.expand center, +table.button.expanded center { + min-width: 0; } table.button:hover table td, table.button:visited table td, @@ -1132,26 +1132,26 @@ th.callout-inner { border: 1px solid #cbcbcb; padding: 10px; background: #fefefe; } - th.callout-inner.primary { - background: #def0fc; - border: 1px solid #444444; - color: #0a0a0a; } - th.callout-inner.secondary { - background: #ebebeb; - border: 1px solid #444444; - color: #0a0a0a; } - th.callout-inner.success { - background: #e1faea; - border: 1px solid #1b9448; - color: #fefefe; } - th.callout-inner.warning { - background: #fff3d9; - border: 1px solid #996800; - color: #fefefe; } - th.callout-inner.alert { - background: #fce6e2; - border: 1px solid #b42912; - color: #fefefe; } +th.callout-inner.primary { + background: #def0fc; + border: 1px solid #444444; + color: #0a0a0a; } +th.callout-inner.secondary { + background: #ebebeb; + border: 1px solid #444444; + color: #0a0a0a; } +th.callout-inner.success { + background: #e1faea; + border: 1px solid #1b9448; + color: #fefefe; } +th.callout-inner.warning { + background: #fff3d9; + border: 1px solid #996800; + color: #fefefe; } +th.callout-inner.alert { + background: #fce6e2; + border: 1px solid #b42912; + color: #fefefe; } .thumbnail { border: solid 4px #fefefe; @@ -1162,27 +1162,27 @@ th.callout-inner { transition: box-shadow 200ms ease-out; border-radius: 3px; margin-bottom: 16px; } - .thumbnail:hover, .thumbnail:focus { - box-shadow: 0 0 6px 1px rgba(33, 153, 232, 0.5); } +.thumbnail:hover, .thumbnail:focus { + box-shadow: 0 0 6px 1px rgba(33, 153, 232, 0.5); } table.menu { width: 580px; } - table.menu td.menu-item, - table.menu th.menu-item { - padding: 10px; - padding-right: 10px; } - table.menu td.menu-item a, - table.menu th.menu-item a { - color: #cd5360; } +table.menu td.menu-item, +table.menu th.menu-item { + padding: 10px; + padding-right: 10px; } +table.menu td.menu-item a, +table.menu th.menu-item a { + color: #cd5360; } table.menu.vertical td.menu-item, table.menu.vertical th.menu-item { padding: 10px; padding-right: 0; display: block; } - table.menu.vertical td.menu-item a, - table.menu.vertical th.menu-item a { - width: 100%; } +table.menu.vertical td.menu-item a, +table.menu.vertical th.menu-item a { + width: 100%; } table.menu.vertical td.menu-item table.menu.vertical td.menu-item, table.menu.vertical td.menu-item table.menu.vertical th.menu-item, @@ -1215,12 +1215,12 @@ body.outlook p { box-sizing: border-box; padding-left: 16px !important; padding-right: 16px !important; } - table.body .columns .column, - table.body .columns .columns, - table.body .column .column, - table.body .column .columns { - padding-left: 0 !important; - padding-right: 0 !important; } + table.body .columns .column, + table.body .columns .columns, + table.body .column .column, + table.body .column .columns { + padding-left: 0 !important; + padding-right: 0 !important; } table.body .collapse .columns, table.body .collapse .column { padding-left: 0 !important; @@ -1334,31 +1334,31 @@ body.outlook p { padding-right: 10px !important; } table.menu { width: 100% !important; } - table.menu td, - table.menu th { - width: auto !important; - display: inline-block !important; } - table.menu.vertical td, - table.menu.vertical th, table.menu.small-vertical td, - table.menu.small-vertical th { - display: block !important; } + table.menu td, + table.menu th { + width: auto !important; + display: inline-block !important; } + table.menu.vertical td, + table.menu.vertical th, table.menu.small-vertical td, + table.menu.small-vertical th { + display: block !important; } table.menu[align="center"] { width: auto !important; } table.button.small-expand, table.button.small-expanded { width: 100% !important; } - table.button.small-expand table, - table.button.small-expanded table { - width: 100%; } - table.button.small-expand table a, - table.button.small-expanded table a { - text-align: center !important; - width: 100% !important; - padding-left: 0 !important; - padding-right: 0 !important; } - table.button.small-expand center, - table.button.small-expanded center { - min-width: 0; } } + table.button.small-expand table, + table.button.small-expanded table { + width: 100%; } + table.button.small-expand table a, + table.button.small-expanded table a { + text-align: center !important; + width: 100% !important; + padding-left: 0 !important; + padding-right: 0 !important; } + table.button.small-expand center, + table.button.small-expanded center { + min-width: 0; } } /* 2 - Custom styles ---------*/ diff --git a/app/packs/stylesheets/oh.scss b/app/packs/stylesheets/oh.scss new file mode 100644 index 0000000..324e250 --- /dev/null +++ b/app/packs/stylesheets/oh.scss @@ -0,0 +1,12 @@ +@import "oh/partials/variables"; +@import "oh/partials/body"; +@import "oh/partials/cards"; +@import "oh/partials/footer"; +@import "oh/partials/galleries"; +@import "oh/partials/landing"; +@import "oh/partials/map"; +@import "oh/partials/navbars"; +@import "oh/partials/processes"; +@import "oh/partials/quill"; +@import "oh/survey_hacks/timetracker.scss"; + diff --git a/app/assets/stylesheets/oh/partials/_body.scss b/app/packs/stylesheets/oh/partials/_body.scss similarity index 100% rename from app/assets/stylesheets/oh/partials/_body.scss rename to app/packs/stylesheets/oh/partials/_body.scss diff --git a/app/assets/stylesheets/oh/partials/_cards.scss b/app/packs/stylesheets/oh/partials/_cards.scss similarity index 100% rename from app/assets/stylesheets/oh/partials/_cards.scss rename to app/packs/stylesheets/oh/partials/_cards.scss diff --git a/app/assets/stylesheets/oh/partials/_footer.scss b/app/packs/stylesheets/oh/partials/_footer.scss similarity index 100% rename from app/assets/stylesheets/oh/partials/_footer.scss rename to app/packs/stylesheets/oh/partials/_footer.scss diff --git a/app/assets/stylesheets/oh/partials/_galleries.scss b/app/packs/stylesheets/oh/partials/_galleries.scss similarity index 63% rename from app/assets/stylesheets/oh/partials/_galleries.scss rename to app/packs/stylesheets/oh/partials/_galleries.scss index 2386390..f463fc6 100644 --- a/app/assets/stylesheets/oh/partials/_galleries.scss +++ b/app/packs/stylesheets/oh/partials/_galleries.scss @@ -1,7 +1,3 @@ -/* - *= require slick - *= require slick-theme - */ @import "variables"; .slick-prev::before, diff --git a/app/assets/stylesheets/oh/partials/_landing.scss b/app/packs/stylesheets/oh/partials/_landing.scss similarity index 100% rename from app/assets/stylesheets/oh/partials/_landing.scss rename to app/packs/stylesheets/oh/partials/_landing.scss diff --git a/app/assets/stylesheets/oh/partials/_map.scss b/app/packs/stylesheets/oh/partials/_map.scss similarity index 100% rename from app/assets/stylesheets/oh/partials/_map.scss rename to app/packs/stylesheets/oh/partials/_map.scss diff --git a/app/assets/stylesheets/oh/partials/_navbars.scss b/app/packs/stylesheets/oh/partials/_navbars.scss similarity index 95% rename from app/assets/stylesheets/oh/partials/_navbars.scss rename to app/packs/stylesheets/oh/partials/_navbars.scss index 95e91b8..aaebbd8 100644 --- a/app/assets/stylesheets/oh/partials/_navbars.scss +++ b/app/packs/stylesheets/oh/partials/_navbars.scss @@ -1,7 +1,5 @@ -@import "decidim/variables"; @import "variables"; -@import "foundation"; -@import "decidim/utils/settings"; +@import "foundation-sites/scss/foundation"; // Overide background default bar .title-bar{ diff --git a/app/assets/stylesheets/oh/partials/_processes.scss b/app/packs/stylesheets/oh/partials/_processes.scss similarity index 100% rename from app/assets/stylesheets/oh/partials/_processes.scss rename to app/packs/stylesheets/oh/partials/_processes.scss diff --git a/app/assets/stylesheets/oh/partials/_quill.scss b/app/packs/stylesheets/oh/partials/_quill.scss similarity index 100% rename from app/assets/stylesheets/oh/partials/_quill.scss rename to app/packs/stylesheets/oh/partials/_quill.scss diff --git a/app/assets/stylesheets/oh/partials/_variables.scss b/app/packs/stylesheets/oh/partials/_variables.scss similarity index 100% rename from app/assets/stylesheets/oh/partials/_variables.scss rename to app/packs/stylesheets/oh/partials/_variables.scss diff --git a/app/packs/stylesheets/oh/survey_hacks/timetracker.scss b/app/packs/stylesheets/oh/survey_hacks/timetracker.scss new file mode 100644 index 0000000..795490a --- /dev/null +++ b/app/packs/stylesheets/oh/survey_hacks/timetracker.scss @@ -0,0 +1 @@ +@import 'clockpicker/dist/jquery-clockpicker.css'; \ No newline at end of file diff --git a/app/views/decidim/conferences/conferences/show.html.erb b/app/views/decidim/conferences/conferences/show.html.erb index cfa778d..f228280 100644 --- a/app/views/decidim/conferences/conferences/show.html.erb +++ b/app/views/decidim/conferences/conferences/show.html.erb @@ -1,5 +1,5 @@ <% add_decidim_meta_tags({ - image_url: current_participatory_space.hero_image.url, + image_url: current_participatory_space.attached_uploader(:hero_image).path, description: translated_attribute(current_participatory_space.short_description), url: conference_url(current_participatory_space), twitter_handler: current_organization.twitter_handler @@ -78,8 +78,7 @@ edit_link( <%= cell("decidim/conferences/linked_participatory_spaces", current_participatory_space) %> <% if current_participatory_space.show_statistics? %> - <%= render partial: "statistics" %> + <%= cell("decidim/statistics", stats.highlighted) %> <% end %> -<%= javascript_include_tag "decidim/conferences/conferences" %> diff --git a/app/views/layouts/decidim/_conference_hero.html.erb b/app/views/layouts/decidim/_conference_hero.html.erb index 1f7fa8f..a131e77 100644 --- a/app/views/layouts/decidim/_conference_hero.html.erb +++ b/app/views/layouts/decidim/_conference_hero.html.erb @@ -1,5 +1,5 @@
+ style="background-image:url(<%= current_participatory_space.attached_uploader(:banner_image).path %>);">
diff --git a/app/views/layouts/decidim/_head_extra.html.erb b/app/views/layouts/decidim/_head_extra.html.erb index 4f4e0ad..9ad04dc 100644 --- a/app/views/layouts/decidim/_head_extra.html.erb +++ b/app/views/layouts/decidim/_head_extra.html.erb @@ -23,6 +23,6 @@ <% if timetracker_survey %> - <%= javascript_include_tag "oh/survey_hacks/timetracker" %> - <%= stylesheet_link_tag "oh/survey_hacks/timetracker" %> -<% end %> \ No newline at end of file + <%= javascript_pack_tag "timetracker" %> + <%= stylesheet_pack_tag "timetracker" %> +<% end %> diff --git a/app/views/layouts/decidim/mailer.html.erb b/app/views/layouts/decidim/mailer.erb similarity index 92% rename from app/views/layouts/decidim/mailer.html.erb rename to app/views/layouts/decidim/mailer.erb index a532c81..d387303 100644 --- a/app/views/layouts/decidim/mailer.html.erb +++ b/app/views/layouts/decidim/mailer.erb @@ -3,7 +3,7 @@ - <%= stylesheet_link_tag "decidim/email" %> + <%= stylesheet_pack_tag "decidim_openheritage_email" %> @@ -47,9 +47,9 @@ @@ -101,7 +101,7 @@
- <% if @organization.official_img_header? %> + <% if @organization.official_img_header.attached? %> <%= link_to @organization.official_url do %> - <%= image_tag @organization.official_img_header.url.to_s , alt: "", style: "max-height: 50px", class: "float-right" %> + <%= image_tag @organization.attached_uploader(:official_img_header).url(host: @organization.host), alt: "", style: "max-height: 50px", class: "float-right" %> <% end %> <% end %>