decidim-navigation_maps 1.1.1 → 1.3.1

data/lib/decidim/navigation_maps/engine.rb

@@ -9,10 +9,6 @@ module Decidim
     class Engine < ::Rails::Engine
       isolate_namespace Decidim::NavigationMaps
 
-      initializer "decidim_navigation_maps.assets" do |app|
-        app.config.assets.precompile += %w(decidim_navigation_maps_manifest.js decidim_navigation_maps_manifest.css)
-      end
-
       initializer "decidim.navigation_maps.content_blocks" do
         Decidim.content_blocks.register(:homepage, :navigation_map) do |content_block|
           content_block.cell = "decidim/navigation_maps/content_blocks/navigation_map"
@@ -21,6 +17,18 @@ module Decidim
 
           content_block.settings do |settings|
             settings.attribute :title, type: :text, translated: true
+            settings.attribute :autohide_tabs, type: :boolean, default: false
+          end
+        end
+
+        Decidim.content_blocks.register(:participatory_process_group_homepage, :navigation_map) do |content_block|
+          content_block.cell = "decidim/navigation_maps/content_blocks/groups_navigation_map"
+          content_block.public_name_key = "decidim.navigation_maps.content_blocks.name"
+          content_block.settings_form_cell = "decidim/navigation_maps/content_blocks/navigation_map_settings_form"
+
+          content_block.settings do |settings|
+            settings.attribute :title, type: :text, translated: true
+            settings.attribute :autohide_tabs, type: :boolean, default: false
           end
         end
       end
@@ -29,6 +37,10 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::NavigationMaps::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::NavigationMaps::Engine.root}/app/views") # for partials
       end
+
+      initializer "decidim_notify.webpacker.assets_path" do
+        Decidim.register_assets_path File.expand_path("app/packs", root)
+      end
     end
   end
 end

data/lib/decidim/navigation_maps/navigation_map_cell_helpers.rb

@@ -7,7 +7,7 @@ module Decidim
       delegate :available_locales, to: :current_organization
 
       def valid_blueprints
-        organization_blueprints.where.not(image: [nil, ""]).order(:created_at)
+        content_block_blueprints.joins(:image_attachment).order(:created_at)
       end
 
       def valid_blueprints?
@@ -15,13 +15,13 @@ module Decidim
       end
 
       def blueprints
-        organization_blueprints.order(:created_at)
+        content_block_blueprints.order(:created_at)
       end
 
       private
 
-      def organization_blueprints
-        @organization_blueprints ||= OrganizationBlueprints.new(current_organization).query
+      def content_block_blueprints
+        @content_block_blueprints ||= (OrganizationBlueprints.new(current_organization) | ContentBlockBlueprints.new(content_block)).query
       end
     end
   end

data/lib/decidim/navigation_maps/test/factories.rb

@@ -8,6 +8,7 @@ FactoryBot.define do
     image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     title { Decidim::Faker::Localized.word }
     description { generate_localized_title }
+    content_block { create(:content_block, organization: organization) }
   end
 
   factory :blueprint_area, class: "Decidim::NavigationMaps::BlueprintArea" do

data/lib/decidim/navigation_maps/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-meetings version.
   module NavigationMaps
-    VERSION = "1.1.1"
-    DECIDIM_VERSION = [">= 0.22", "< 0.24"].freeze
+    VERSION = "1.3.1"
+    DECIDIM_VERSION = [">= 0.25", "< 0.27"].freeze
   end
 end

data/lib/decidim/navigation_maps.rb

@@ -5,8 +5,6 @@ require "decidim/navigation_maps/engine"
 require "decidim/navigation_maps/admin_engine"
 
 module Decidim
-  # This namespace holds the logic of the `NavigationMaps` component. This component
-  # allows users to create navigation_maps in a participatory space.
   module NavigationMaps
     autoload :NavigationMapCellHelpers, "decidim/navigation_maps/navigation_map_cell_helpers"
   end

data/lib/tasks/custom_seeds.rake

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+namespace :decidim_navigation_maps do
+  desc "custom seeding"
+  task seed: :environment do
+    Decidim::NavigationMaps::Engine.load_seed
+  end
+end

data/lib/tasks/decidim_navigation_maps_webpacker_tasks.rake

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require "decidim/gem_manager"
+
+namespace :decidim_navigation_maps do
+  namespace :webpacker do
+    desc "Installs Decidim Awesome webpacker files in Rails instance application"
+    task install: :environment do
+      raise "Decidim gem is not installed" if decidim_path.nil?
+
+      install_navigation_maps_npm
+    end
+
+    desc "Adds Decidim Awesome dependencies in package.json"
+    task upgrade: :environment do
+      raise "Decidim gem is not installed" if decidim_path.nil?
+
+      install_navigation_maps_npm
+    end
+
+    def install_navigation_maps_npm
+      navigation_maps_npm_dependencies.each do |type, packages|
+        system! "npm i --save-#{type} #{packages.join(" ")}"
+      end
+    end
+
+    def navigation_maps_npm_dependencies
+      @navigation_maps_npm_dependencies ||= begin
+        package_json = JSON.parse(File.read(navigation_maps_path.join("package.json")))
+
+        {
+          prod: package_json["dependencies"].map { |package, version| "#{package}@#{version}" },
+          dev: package_json["devDependencies"].map { |package, version| "#{package}@#{version}" }
+        }.freeze
+      end
+    end
+
+    def navigation_maps_path
+      @navigation_maps_path ||= Pathname.new(navigation_maps_gemspec.full_gem_path) if Gem.loaded_specs.has_key?(gem_name)
+    end
+
+    def navigation_maps_gemspec
+      @navigation_maps_gemspec ||= Gem.loaded_specs[gem_name]
+    end
+
+    def rails_app_path
+      @rails_app_path ||= Rails.root
+    end
+
+    def system!(command)
+      system("cd #{rails_app_path} && #{command}") || abort("\n== Command #{command} failed ==")
+    end
+
+    def gem_name
+      "decidim-navigation_maps"
+    end
+  end
+end

data/lib/tasks/navigation_maps_active_storage_migration_tasks.rake

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+namespace :navigation_maps do
+  namespace :active_storage_migrations do
+    desc "Migrates editor images from Carrierwave to ActiveStorage"
+    task migrate_from_carrierwave: :environment do
+      stdout = Logger.new($stdout)
+      stdout.level = Logger::INFO
+      Rails.logger.extend(ActiveSupport::Logger.broadcast(stdout))
+      Decidim::Organization.find_each do |organization|
+        puts "Migrating Organization #{organization.id} (#{organization.host})..."
+        routes_mappings = []
+        Decidim::NavigationMaps::MigrateLegacyImagesJob.perform_now(organization.id, routes_mappings)
+
+        path = Rails.root.join("tmp/navigation_maps_editor_images_mappings.csv")
+        dirname = File.dirname(path)
+        FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+        File.open(path, "wb") do |file|
+          file.write(Decidim::Exporters::CSV.new(routes_mappings).export.read)
+        end
+      end
+    end
+
+    desc "Checks editor images migrated from Carrierwave to ActiveStorage"
+    task check_migration_from_carrierwave: :environment do
+      logger = ActiveSupport::TaggedLogging.new(Logger.new($stdout))
+
+      Decidim::CarrierWaveMigratorService.check_migration(
+        klass: Decidim::NavigationMaps::Blueprint,
+        cw_attribute: "image",
+        cw_uploader: Decidim::NavigationMaps::Cw::BlueprintUploader,
+        as_attribute: "image",
+        logger: logger
+      )
+    end
+  end
+end

data/package.json

@@ -0,0 +1,197 @@
+{
+  "name": "decidim-module-navigation_maps",
+  "version": "1.0.0",
+  "description": "A Blueprint/Map navigation for Decidim",
+  "scripts": {
+    "lint": "eslint -c .eslintrc.json --ext .js app/packs/",
+    "lint-fix": "eslint -c .eslintrc.json --ext .js app/packs/ --fix",
+    "stylelint": "stylelint **/*.scss",
+    "stylelint-fix": "stylelint **/*.scss --fix"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Platoniq/decidim-module-navigation_maps.git"
+  },
+  "keywords": [
+    "decidim"
+  ],
+  "author": "Ivan Verges <ivan@platoniq.net>",
+  "license": "AGPL-3.0-or-later",
+  "bugs": {
+    "url": "https://github.com/Platoniq/decidim-module-navigation_maps/issues"
+  },
+  "homepage": "https://github.com/Platoniq/decidim-module-navigation_maps#readme",
+  "stylelint": {
+    "rules": {
+      "at-rule-empty-line-before": [
+        "always",
+        {
+          "except": [
+            "blockless-after-same-name-blockless",
+            "first-nested"
+          ],
+          "ignore": [
+            "after-comment"
+          ],
+          "ignoreAtRules": [
+            "else"
+          ]
+        }
+      ],
+      "at-rule-name-case": "lower",
+      "at-rule-semicolon-newline-after": "always",
+      "block-closing-brace-empty-line-before": "never",
+      "block-closing-brace-newline-after": "always",
+      "block-closing-brace-newline-before": "always-multi-line",
+      "block-closing-brace-space-before": "always-single-line",
+      "block-no-empty": true,
+      "block-opening-brace-newline-after": "always-multi-line",
+      "block-opening-brace-space-after": "always-single-line",
+      "block-opening-brace-space-before": "never",
+      "color-hex-case": "lower",
+      "color-hex-length": "short",
+      "color-no-invalid-hex": true,
+      "comment-empty-line-before": [
+        "always",
+        {
+          "except": [
+            "first-nested"
+          ],
+          "ignore": [
+            "stylelint-commands"
+          ]
+        }
+      ],
+      "comment-no-empty": true,
+      "comment-whitespace-inside": "always",
+      "custom-property-empty-line-before": [
+        "always",
+        {
+          "except": [
+            "after-custom-property",
+            "first-nested"
+          ],
+          "ignore": [
+            "after-comment",
+            "inside-single-line-block"
+          ]
+        }
+      ],
+      "declaration-bang-space-after": "never",
+      "declaration-bang-space-before": "always",
+      "declaration-block-no-duplicate-properties": [
+        true,
+        {
+          "ignore": [
+            "consecutive-duplicates-with-different-values"
+          ]
+        }
+      ],
+      "declaration-block-no-redundant-longhand-properties": true,
+      "declaration-block-no-shorthand-property-overrides": true,
+      "declaration-block-semicolon-newline-after": "always-multi-line",
+      "declaration-block-semicolon-space-after": "always-single-line",
+      "declaration-block-semicolon-space-before": "never",
+      "declaration-block-single-line-max-declarations": 1,
+      "declaration-block-trailing-semicolon": "always",
+      "declaration-colon-newline-after": "always-multi-line",
+      "declaration-colon-space-after": "always-single-line",
+      "declaration-colon-space-before": "never",
+      "declaration-empty-line-before": [
+        "always",
+        {
+          "except": [
+            "after-declaration",
+            "first-nested"
+          ],
+          "ignore": [
+            "after-comment",
+            "inside-single-line-block"
+          ]
+        }
+      ],
+      "function-calc-no-unspaced-operator": true,
+      "function-comma-newline-after": "always-multi-line",
+      "function-comma-space-after": "always-single-line",
+      "function-comma-space-before": "never",
+      "function-linear-gradient-no-nonstandard-direction": true,
+      "function-max-empty-lines": 0,
+      "function-name-case": "lower",
+      "function-parentheses-newline-inside": "always-multi-line",
+      "function-parentheses-space-inside": "never-single-line",
+      "function-whitespace-after": "always",
+      "indentation": 2,
+      "keyframe-declaration-no-important": true,
+      "length-zero-no-unit": true,
+      "max-empty-lines": 1,
+      "media-feature-colon-space-after": "always",
+      "media-feature-colon-space-before": "never",
+      "media-feature-name-case": "lower",
+      "media-feature-name-no-unknown": true,
+      "media-feature-parentheses-space-inside": "never",
+      "media-feature-range-operator-space-after": "always",
+      "media-feature-range-operator-space-before": "always",
+      "media-query-list-comma-newline-after": "always-multi-line",
+      "media-query-list-comma-space-after": "always-single-line",
+      "media-query-list-comma-space-before": "never",
+      "no-empty-source": true,
+      "no-eol-whitespace": true,
+      "no-extra-semicolons": true,
+      "no-invalid-double-slash-comments": true,
+      "no-missing-end-of-source-newline": true,
+      "number-leading-zero": "never",
+      "number-no-trailing-zeros": true,
+      "property-case": "lower",
+      "property-no-unknown": true,
+      "rule-empty-line-before": [
+        "always-multi-line",
+        {
+          "except": [
+            "first-nested"
+          ],
+          "ignore": [
+            "after-comment"
+          ]
+        }
+      ],
+      "selector-attribute-brackets-space-inside": "never",
+      "selector-attribute-operator-space-after": "never",
+      "selector-attribute-operator-space-before": "never",
+      "selector-combinator-space-after": "always",
+      "selector-combinator-space-before": "always",
+      "selector-descendant-combinator-no-non-space": true,
+      "selector-list-comma-newline-after": "always",
+      "selector-list-comma-space-before": "never",
+      "selector-max-empty-lines": 0,
+      "selector-pseudo-class-case": "lower",
+      "selector-pseudo-class-no-unknown": true,
+      "selector-pseudo-class-parentheses-space-inside": "never",
+      "selector-pseudo-element-case": "lower",
+      "selector-pseudo-element-colon-notation": "double",
+      "selector-pseudo-element-no-unknown": true,
+      "selector-type-case": "lower",
+      "selector-type-no-unknown": true,
+      "shorthand-property-no-redundant-values": true,
+      "string-no-newline": true,
+      "unit-case": "lower",
+      "unit-no-unknown": true,
+      "value-list-comma-newline-after": "always-multi-line",
+      "value-list-comma-space-after": "always-single-line",
+      "value-list-comma-space-before": "never",
+      "value-list-max-empty-lines": 0
+    }
+  },
+  "dependencies": {
+    "@geoman-io/leaflet-geoman-free": "^2.11.4",
+    "jquery-form": "^4.3.0",
+    "jsviews": "^1.0.11"
+  },
+  "devDependencies": {
+    "eslint": "^7.32.0",
+    "eslint": "^7.25.0",
+    "eslint-config-prettier": "^8.2.0",
+    "eslint-config-standard": "^11.0.0",
+    "eslint-plugin-import": "^2.22.0",
+    "stylelint": "13.11.0"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-navigation_maps
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,61 +16,61 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.27'
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.27'
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.27'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
-description: Allows to map processes to image parts using maps.
+        version: '0.27'
+description: Allows to create visual guiding maps in content blocks for Decidim.
 email:
 - ivan@platoniq.net
 executables: []
@@ -80,18 +80,7 @@ files:
 - LICENSE-AGPLv3.txt
 - README.md
 - Rakefile
-- app/assets/config/admin/decidim_navigation_maps_manifest.css
-- app/assets/config/admin/decidim_navigation_maps_manifest.js
-- app/assets/config/decidim_navigation_maps_manifest.css
-- app/assets/config/decidim_navigation_maps_manifest.js
-- app/assets/images/decidim/navigation_maps/icon.svg
-- app/assets/javascripts/decidim/navigation_maps/admin/map_editor.js
-- app/assets/javascripts/decidim/navigation_maps/admin/navigation_maps.js
-- app/assets/javascripts/decidim/navigation_maps/map_view.js
-- app/assets/javascripts/decidim/navigation_maps/navigation_maps.js
-- app/assets/stylesheets/decidim/navigation_maps/_variables.scss
-- app/assets/stylesheets/decidim/navigation_maps/admin/navigation_maps.scss
-- app/assets/stylesheets/decidim/navigation_maps/navigation_maps.scss
+- app/cells/decidim/navigation_maps/content_blocks/groups_navigation_map_cell.rb
 - app/cells/decidim/navigation_maps/content_blocks/navigation_map/_styles.erb
 - app/cells/decidim/navigation_maps/content_blocks/navigation_map/_tabs.erb
 - app/cells/decidim/navigation_maps/content_blocks/navigation_map/_tabs_content.erb
@@ -112,14 +101,29 @@ files:
 - app/forms/decidim/navigation_maps/area_form.rb
 - app/forms/decidim/navigation_maps/blueprint_form.rb
 - app/forms/decidim/navigation_maps/blueprint_forms.rb
+- app/jobs/decidim/navigation_maps/migrate_legacy_images_job.rb
 - app/models/decidim/navigation_maps/application_record.rb
 - app/models/decidim/navigation_maps/blueprint.rb
 - app/models/decidim/navigation_maps/blueprint_area.rb
+- app/packs/entrypoints/decidim_admin_navigation_maps.js
+- app/packs/entrypoints/decidim_admin_navigation_maps.scss
+- app/packs/entrypoints/decidim_navigation_maps.js
+- app/packs/entrypoints/decidim_navigation_maps.scss
+- app/packs/src/decidim/navigation_maps/admin/map_editor.js
+- app/packs/src/decidim/navigation_maps/admin/navigation_maps.js
+- app/packs/src/decidim/navigation_maps/map_view.js
+- app/packs/src/decidim/navigation_maps/navigation_maps.js
+- app/packs/stylesheets/decidim/navigation_maps/_variables.scss
+- app/packs/stylesheets/decidim/navigation_maps/admin/navigation_maps.scss
+- app/packs/stylesheets/decidim/navigation_maps/navigation_maps.scss
+- app/queries/decidim/navigation_maps/content_block_blueprints.rb
 - app/queries/decidim/navigation_maps/organization_blueprints.rb
 - app/uploaders/decidim/navigation_maps/blueprint_uploader.rb
+- app/uploaders/decidim/navigation_maps/cw/blueprint_uploader.rb
 - app/views/decidim/navigation_maps/admin/areas/_form.html.erb
 - app/views/decidim/navigation_maps/admin/areas/new.html.erb
 - app/views/decidim/navigation_maps/admin/areas/show.html.erb
+- config/assets.rb
 - config/i18n-tasks.yml
 - config/locales/ca.yml
 - config/locales/cs.yml
@@ -131,10 +135,12 @@ files:
 - db/migrate/20191126045831_add_link_type_to_decidim_navigation_maps_blueprint_areas.rb
 - db/migrate/20191126154019_add_area_id_to_decidim_navigation_maps_blueprint_areas.rb
 - db/migrate/20191127093746_add_color_to_navigation_maps_blueprint_areas.rb
+- db/migrate/20201105130724_add_reference_to_content_block_to_blueprints_table.rb
 - db/migrate/20210112135817_add_height_to_navigation_maps_blueprints.rb
 - db/seeds.rb
 - db/seeds/antarctica.png
 - db/seeds/penguins.jpg
+- db/seeds/pla-cerda.jpg
 - lib/decidim/navigation_maps.rb
 - lib/decidim/navigation_maps/admin.rb
 - lib/decidim/navigation_maps/admin_engine.rb
@@ -142,25 +148,10 @@ files:
 - lib/decidim/navigation_maps/navigation_map_cell_helpers.rb
 - lib/decidim/navigation_maps/test/factories.rb
 - lib/decidim/navigation_maps/version.rb
-- vendor/assets/images/draw/layers-2x.png
-- vendor/assets/images/draw/layers.png
-- vendor/assets/images/draw/marker-icon-2x.png
-- vendor/assets/images/draw/marker-icon.png
-- vendor/assets/images/draw/marker-shadow.png
-- vendor/assets/images/draw/spritesheet-2x.png
-- vendor/assets/images/draw/spritesheet.png
-- vendor/assets/images/draw/spritesheet.svg
-- vendor/assets/images/images/layers-2x.png
-- vendor/assets/images/images/layers.png
-- vendor/assets/images/images/marker-icon-2x.png
-- vendor/assets/images/images/marker-icon.png
-- vendor/assets/images/images/marker-shadow.png
-- vendor/assets/javascripts/jquery.form.js
-- vendor/assets/javascripts/jsrender.min.js
-- vendor/assets/javascripts/jsrender.min.js.map
-- vendor/assets/javascripts/leaflet-geoman.min.js
-- vendor/assets/javascripts/leaflet.js
-- vendor/assets/stylesheets/leaflet-geoman.css
+- lib/tasks/custom_seeds.rake
+- lib/tasks/decidim_navigation_maps_webpacker_tasks.rake
+- lib/tasks/navigation_maps_active_storage_migration_tasks.rake
+- package.json
 homepage: https://github.com/Platoniq/decidim-module-navigation_maps
 licenses:
 - AGPL-3.0
@@ -173,14 +164,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A decidim navigation_maps module

data/app/assets/config/admin/decidim_navigation_maps_manifest.css

@@ -1,3 +0,0 @@
-/*
- *= link decidim/navigation_maps/admin/navigation_maps.css
- */

data/app/assets/config/admin/decidim_navigation_maps_manifest.js

@@ -1,3 +0,0 @@
-//= link decidim/navigation_maps/admin/navigation_maps.js
-//= require jquery.form
-//= require leaflet

data/app/assets/config/decidim_navigation_maps_manifest.css

@@ -1,3 +0,0 @@
-/*
- *= link decidim/navigation_maps/navigation_maps.css
- */

data/app/assets/config/decidim_navigation_maps_manifest.js

@@ -1 +0,0 @@
-//= link decidim/navigation_maps/navigation_maps.js

data/app/assets/images/decidim/navigation_maps/icon.svg

@@ -1 +0,0 @@
-<svg height="35px" width="35px" fill="#000000" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 1 511 511" style="enable-background:new 0 1 511 511;" xml:space="preserve"><g><path d="M205.6,146.9c-22.2,0-40.2,18-40.2,40.2c0,22.2,18,40.2,40.2,40.2c22.2,0,40.2-18,40.2-40.2   C245.9,165,227.8,146.9,205.6,146.9z M205.6,206.6c-10.7,0-19.3-8.7-19.3-19.3c0-10.7,8.7-19.3,19.3-19.3   c10.6,0,19.3,8.7,19.3,19.3C225,197.9,216.3,206.6,205.6,206.6z"/><path d="M406.6,178V70.3c0-5.8-4.2-10.1-10-10.1H10.6C4.8,60.3,0,64.6,0,70.3v304.9c0,5.8,4.8,10.9,10.6,10.9h242   c24.5,39.8,68.7,66.7,119.1,66.7c77,0,139.4-62.8,139.4-139.7C511,248.4,467.4,193.7,406.6,178z M21,365.2v-284h364.7v92.9   c-4.2-0.5-9.1-0.7-14-0.7c-0.3,0-0.6,0-0.6,0v-66.4c0-5.8-5-10-10.9-10H47.2c-5.8,0-10.5,4.2-10.5,10v231.8   c0,5.8,4.7,10.8,10.5,10.8h189.7c1.5,5.2,3.1,10.5,5.2,15.7H21z M232.9,328.6H57.6v-40.4l61.5-54.3c2.8-2.5,7-2.6,10-0.2l63.3,50.6   c10.7,8.6,26,8.4,36.5-0.5l7.6-6.5c-3,11.4-4.6,23.6-4.6,35.8C232,318.3,232.3,323.3,232.9,328.6z M215.7,267.8   c-2.8,2.4-7,2.4-10,0.1l-63.4-50.6c-10.9-8.7-26.5-8.4-37,0.9l-47.7,42V117.9H350v57.2c-37.7,6-70.1,26.8-91.4,56.4L215.7,267.8z    M371.6,431.7C306.2,431.7,253,378.4,253,313s53.2-118.6,118.6-118.6c65.4,0,118.6,53.2,118.6,118.6   C490.4,378.4,437.1,431.7,371.6,431.7z"/><path d="M435.4,234c-34.8-34.6-91-34.6-125.6,0c-13.7,13.7-22.4,31.2-25,50.4c-2.5,18.5,0.9,37.8,9.9,54.4c0,0,0,0.1,0.1,0.1   c4.4,8,9.4,14.7,15.2,20.4l55.1,55.1c2,2,4.6,3,7.4,3s5.5-1.2,7.4-3l55.1-55.1c16.9-16.9,26.2-39.2,26.2-62.8   C461.4,273,452.2,250.7,435.4,234z M420.1,344.6l-47.7,47.7l-47.7-47.7c-4.4-4.4-8.2-9.5-11.6-15.7c-14.2-26.6-9.6-58.8,11.6-80.1   c26.4-26.4,69.4-26.4,95.8,0c12.8,12.8,19.8,29.8,19.7,47.7C440.2,314.6,433,331.7,420.1,344.6z"/><path d="M372.3,241.7c-29,0-52.7,23.7-52.7,52.7c0,29,23.7,52.7,52.7,52.7s52.7-23.7,52.7-52.7   C425.1,265.4,401.5,241.7,372.3,241.7z M372.3,326c-17.5,0-31.8-14.2-31.8-31.8c0-17.5,14.3-31.8,31.8-31.8   c17.5,0,31.8,14.3,31.8,31.8C404.1,311.8,389.9,326,372.3,326z"/></g></svg>