maglevcms 1.2.2 → 1.4.0

data/app/frontend/editor/locales/editor.pt-BR.json

@@ -0,0 +1,257 @@
+{
+  "headerNav": {
+    "pages": "Páginas:",
+    "pageSettings": "Configurações da página",
+    "previewSite": "Visualizar site",
+    "previewToggler": {
+      "button": "Visualizar site",
+      "draftLink": "Versão de rascunho",
+      "liveLink": "Versão publicada"
+    },
+    "publishButton": {
+      "default": "Publicar site",
+      "inProgress": "Publicando...",
+      "success": "Publicado!",
+      "fail": "Falhou!"
+    },
+    "saveButton": {
+      "default": "Salvar",
+      "inProgress": "Salvando...",
+      "success": "Salvo!",
+      "fail": "Falhou!"
+    }
+  },
+  "sidebarNav": {
+    "addNewSectionTooltip": "Adicionar uma nova seção na parte inferior da página",
+    "managePageSectionsTooltip": "Reordenar / excluir as seções da página",
+    "editStyleTooltip": "Alterar o estilo do seu site",
+    "openImageLibraryTooltip": "Abrir a galeria de imagens",
+    "leaveEditorTooltip": "Voltar para o aplicativo principal"
+  },
+  "pagePreview": {
+    "loading": "Carregando...",
+    "empty": {
+      "title": {
+        "withoutLocale": "Sua página está em branco",
+        "withLocale": "Sua página em %{localeName} está em branco"
+      },
+      "message": "Por favor, adicione a primeira seção clicando no botão {icon} na barra lateral esquerda."
+    }
+  },
+  "page": {
+    "list": {
+      "title": "Lista de páginas",
+      "subTitle": "Gerenciar as páginas do seu site",
+      "newButton": "Nova página",
+      "searchPlaceholder": "Digite sua pesquisa aqui...",
+      "item": {
+        "edit": "Editar configurações da página",
+        "clone": "Clonar página",
+        "hide": "Ocultar página",
+        "show": "Mostrar página",
+        "delete": "Excluir página"
+      }
+    },
+    "new": {
+      "title": "Criar uma nova página",
+      "submitButton": {
+        "default": "Criar página",
+        "inProgress": "Criando...",
+        "success": "Criado!",
+        "fail": "Falhou!"
+      },
+      "cancelButton": "Cancelar"
+    },
+    "edit": {
+      "title": "Editando uma página",
+      "currentPage": {
+        "title": "Editando a página atual"
+      },
+      "submitButton": {
+        "default": "Atualizar página",
+        "inProgress": "Atualizando...",
+        "success": "Atualizado!",
+        "fail": "Falhou!"
+      },
+      "cancelButton": "Cancelar"
+    },
+    "form": {
+      "tabs": {
+        "main": "Principal",
+        "seo": "SEO"
+      },
+      "title": "Título",
+      "path": "Caminho",
+      "visible": "Visível",
+      "visiblePlaceholder": "Mostrar/Ocultar a página",
+      "seoTitle": "Título meta",
+      "metaDescription": "Descrição meta",
+      "ogTitle": "og:title",
+      "ogDescription": "og:description",
+      "ogImageUrl": "og:image"
+    }
+  },
+  "sections": {
+    "addPane": {
+      "title": "Adicionar uma seção"
+    },
+    "listPane": {
+      "title": "Organizar seções",
+      "empty": "Não há seções."
+    }
+  },
+  "sectionPane": {
+    "tabs": {
+      "settings": "Conteúdo",
+      "blocks": "Blocos",
+      "advanced": "Avançado"
+    },
+    "blockList": {
+      "add": "Adicionar novo item"
+    }
+  },
+  "sectionBlockPane": {
+    "tabs": {
+      "settings": "Conteúdo",
+      "blocks": "Blocos",
+      "advanced": "Avançado"
+    }
+  },
+  "themeSectionList": {
+    "emptyCategory": "Nenhuma seção"
+  },
+  "style": {
+    "edit": {
+      "title": "Estilizar seu site",
+      "submitButton": {
+        "default": "Atualizar estilo",
+        "inProgress": "Atualizando...",
+        "success": "Atualizado!",
+        "fail": "Falhou!"
+      }
+    }
+  },
+  "imageInput": {
+    "addButton": "Adicionar imagem",
+    "replaceButton": "Substituir imagem",
+    "clearButton": "Limpar",
+    "altTextPlaceholder": "Texto alternativo para ajudar os mecanismos de busca"
+  },
+  "imageLibrary": {
+    "title": "Lista de imagens",
+    "pickerTitle": "Selecionar uma imagem",
+    "none": "Nenhuma imagem enviada ainda",
+    "searchPlaceholder": "Buscar por um nome de arquivo",
+    "pagination": {
+      "label": "%{start} - %{end} de %{totalItems} imagens",
+      "noItems": "Nenhuma imagem"
+    },
+    "destroy": {
+      "text": "Tem certeza?",
+      "ok": "Sim, exclua",
+      "cancel": "Cancelar"
+    },
+    "uploader": {
+      "wrongFiles": "Certifique-se de que o tamanho de cada imagem não seja maior que %{limit}.",
+      "uploadButton": {
+        "default": "Enviar imagens",
+        "inProgress": "Enviando...",
+        "success": "Enviado!",
+        "fail": "Falha!"
+      }
+    }
+  },
+  "iconInput": {
+    "addButton": "Adicionar ícone",
+    "replaceButton": "Substituir ícone",
+    "clearButton": "Limpar"
+  },
+  "iconLibrary": {
+    "title": "Ícones",
+    "pickerTitle": "Escolher um ícone"
+  },
+  "linkInput": {
+    "placeholder": "Clique aqui para selecionar um link",
+    "withNestedTextLabel": "Ativar texto",
+    "nestedTextPlaceholder": "Texto"
+  },
+  "linkPicker": {
+    "title": "Selecionar um link",
+    "insertTitle": "Inserir um link",
+    "page": {
+      "name": "Página",
+      "input": {
+        "label": "Página",
+        "placeholder": "Selecione uma página",
+        "searchPlaceholder": "Pesquisar...",
+        "emptyLabel": "Nenhuma página encontrada"
+      },
+      "sectionInput": {
+        "label": "Seção",
+        "placeholder": "Selecione uma seção",
+        "emptyLabel": "Nenhuma seção selecionada"
+      }
+    },
+    "url": {
+      "name": "URL",
+      "input": {
+        "label": "URL"
+      }
+    },
+    "email": {
+      "name": "Email",
+      "input": {
+        "label": "Email"
+      }
+    },
+    "shared": {
+      "mainButton": {
+        "select": "Selecionar",
+        "insert": "Adicionar"
+      },
+      "cancelButton": "Cancelar",
+      "newWindowInput": {
+        "label": "Abrir em nova janela"
+      }
+    }
+  },
+  "collectionItemInput": {
+    "select": {
+      "placeholder": "Selecione um item",
+      "searchPlaceholder": "Pesquisar...",
+      "emptyLabel": "Nenhum item encontrado"
+    }
+  },
+  "pagination": {
+    "defaultLabel": "%{start} - %{end} de %{totalItems} itens",
+    "defaultNoItems": "Nenhum"
+  },
+  "confirmationButton": {
+    "text": "Você tem certeza de que deseja realizar esta ação?",
+    "confirmButtonLabel": "Sim",
+    "cancelButtonLabel": "Não"
+  },
+  "errorModals": {
+    "staleRecord": {
+      "title": "Pedimos desculpas 🙇",
+      "message": "Não conseguimos salvar suas alterações porque outra pessoa atualizou o conteúdo no intervalo de tempo.",
+      "button": "Por favor, recarregue a página"
+    }
+  },
+  "support": {
+    "human": {
+      "storageUnits": {
+        "format": "%{number} %{unit}",
+        "units": {
+          "byte": {
+            "one": "Byte",
+            "other": "Bytes"
+          },
+          "kb": "KB",
+          "mb": "MB",
+          "gb": "GB"
+        }
+      }
+    }
+  }
+}

data/app/frontend/editor/locales/index.js

@@ -1,14 +1,17 @@
 import EditorEN from './editor.en.json'
 import EditorES from './editor.es.json'
 import EditorFR from './editor.fr.json'
+import EditorPTBR from './editor.pt-BR.json'
 import { deepMerge } from '@/misc/utils'
 
 const overriddenEN = window.customTranslations?.en ?? {}
 const overriddenES = window.customTranslations?.es ?? {}
 const overriddenFR = window.customTranslations?.fr ?? {}
+const overriddenPTBR = (window.customTranslations && window.customTranslations['pt-BR']) ? window.customTranslations['pt-BR'] : {}
 
 export default {
   en: deepMerge(EditorEN, overriddenEN),
   es: deepMerge(EditorES, overriddenES),
   fr: deepMerge(EditorFR, overriddenFR),
+  "pt-BR": deepMerge(EditorPTBR, overriddenPTBR),
 }

data/app/frontend/editor/mixins/global.js

@@ -16,9 +16,15 @@ Vue.mixin({
     currentSite() {
       return this.$store.state.site
     },
+    currentI18nScope() {
+      return `themes.${this.currentTheme.id}`
+    },
     currentStyle() {
       return this.$store.state.style
     },
+    currentStyleI18nScope() {
+      return `${this.currentI18nScope}.style`
+    },
     currentLocale() {
       return this.$store.state.locale
     },
@@ -34,6 +40,9 @@ Vue.mixin({
     currentSection() {
       return this.$store.state.section
     },
+    currentSectionI18nScope() {
+      return `${this.currentI18nScope}.sections.${this.currentSection.type}`
+    },
     currentSectionList() {
       return this.$store.getters.sectionList
     },
@@ -55,6 +64,9 @@ Vue.mixin({
     currentSectionBlock() {
       return this.$store.state.sectionBlock
     },
+    currentSectionBlockI18nScope() {
+      return `${this.currentSectionI18nScope}.blocks.${this.currentSectionBlock.type}`
+    },
     currentSectionBlockIndex() {
       return this.$store.getters.sectionBlockIndex
     },
@@ -120,5 +132,9 @@ Vue.mixin({
     closeModal() {
       ModalBus.$emit('close')
     },
+    $st(key) {
+      // console.log('$st', key, this.$te(key) ? this.$t(key) : null)
+      return this.$te(key) ? this.$t(key) : null
+    }
   },
 })

data/app/frontend/editor/router/index.js

@@ -15,7 +15,7 @@ const router = new VueRouter({
 router.beforeEach((to, from, next) => {
   // The router hasn't found a component to display so get back
   // to the screen without any UI drawer opened.
-  if (to.matched.length === 0) {
+  if (to.matched.length === 0)
     return next({
       name: 'editPage',
       params: {
@@ -23,7 +23,6 @@ router.beforeEach((to, from, next) => {
         locale: store.state.locale,
       },
     })
-  }
 
   // When an user wants to edit another page or to edit the current page
   // in a different locale, the router detects it and dispatch the new

data/app/frontend/editor/views/content-pane.vue

@@ -53,10 +53,10 @@ export default {
       else return null
     },
     sectionTitle() {
-      return this.currentSectionDefinition?.name
+      return this.$st(`${this.currentSectionI18nScope}.name`) || this.currentSectionDefinition?.name
     },
     sectionBlockTitle() {
-      return (
+      return this.$st(`${this.currentSectionI18nScope}.blocks.label`) || (
         this.currentSectionBlockDefinition?.name +
         ' ' +
         `#${this.currentSectionBlockIndex}`

data/app/models/concerns/maglev/sections_concern.rb

@@ -2,54 +2,58 @@
 
 # rubocop:disable Style/ClassAndModuleChildren
 module Maglev::SectionsConcern
-  def prepare_sections
+  def prepare_sections(theme)
     # NOTE: pages defined in the theme definition
     # don't include the ids for sections/blocks
     self.sections ||= [] # NOTE: the self is mandatory here
     sections.each do |section|
-      prepare_section(section)
+      prepare_section(theme, section)
     end
   end
 
-  def prepare_sections_translations
+  def prepare_sections_translations(theme)
     return if sections_translations.blank?
 
     sections_translations.each_key do |locale|
       Maglev::I18n.with_locale(locale) do
-        prepare_sections
+        prepare_sections(theme)
       end
     end
   end
 
   private
 
-  def prepare_section(section)
+  def prepare_section(theme, section)
     section['id'] ||= SecureRandom.urlsafe_base64(8)
-    section['settings'] = prepare_settings(section['settings'])
+    section['settings'] = prepare_settings(theme, section['type'], nil, section['settings'])
     section['blocks'] = (section['blocks'] || []).map do |block|
-      prepare_block(block)
+      prepare_block(theme, section['type'], block)
     end.flatten
     section
   end
 
-  def prepare_block(block)
+  def prepare_block(theme, section_type, block)
     block['id'] ||= SecureRandom.urlsafe_base64(8)
-    block['settings'] = prepare_settings(block['settings'])
+    block['settings'] = prepare_settings(theme, section_type, block['type'], block['settings'])
 
     # the children key is accepted when the sections come from a theme preset
     children = (block.delete('children') || []).map do |nested_block|
       nested_block['parent_id'] = block['id']
-      prepare_block(nested_block)
+      prepare_block(theme, section_type, nested_block)
     end
     [block, children].flatten
   end
 
-  def prepare_settings(settings)
+  def prepare_settings(theme, section_type, block_type, settings)
     # NOTE: in the theme definition file, we allow developers to declare
     # default content like this: { <setting_id_1>: <setting_value_1>, ..., <setting_id_n>: <setting_value_n> }
-    return settings if settings.is_a?(Array)
+    settings = settings.map { |key, value| { id: key, value: value } } unless settings.is_a?(Array)
 
-    settings.map { |key, value| { id: key, value: value } }
+    settings.map do |setting|
+      setting = setting.with_indifferent_access
+      type = theme.find_setting!(section_type, block_type, setting['id'])
+      setting.merge({ value: type.cast_value(setting['value']) })
+    end
   end
 end
 # rubocop:enable Style/ClassAndModuleChildren

data/app/models/concerns/maglev/translatable.rb

@@ -11,6 +11,10 @@ module Maglev
       public_send("#{attr}_translations")
     end
 
+    def translate_attr_in(attr, locale, source_locale)
+      translations_for(attr)[locale.to_s] ||= translations_for(attr)[source_locale.to_s]
+    end
+
     class_methods do
       def order_by_translated(attr, direction)
         order(Arel.sql("#{attr}_translations->>'#{Maglev::I18n.current_locale}'") => direction)

data/app/models/maglev/page.rb

@@ -34,5 +34,11 @@ module Maglev
     def static?
       false
     end
+
+    def translate_in(locale, source_locale)
+      %i[title sections seo_title meta_description og_title og_description og_image_url].each do |attr|
+        translate_attr_in(attr, locale, source_locale)
+      end
+    end
   end
 end

data/app/models/maglev/section/setting.rb

@@ -5,46 +5,37 @@ class Maglev::Section::Setting
   ## concerns ##
   include ActiveModel::Model
 
+  ## constants ##
+  REGISTERED_TYPES = %w[text image checkbox link color select collection_item icon divider hint].freeze
+
   ## attributes ##
   attr_accessor :id, :label, :type, :default, :options
 
   ## validations ##
   validates :id, :label, :type, :default, 'maglev/presence': true
-  validates :type, inclusion: { in: %w[text image checkbox link color select collection_item icon] }
+  validates :type, inclusion: { in: REGISTERED_TYPES }
 
   ## methods ##
 
-  # NOTE: any modification to that method must be reflected to the JS editor
-  def build_default_content(custom_default = nil)
-    default = custom_default.nil? ? self.default : custom_default
-    case type.to_sym
-    when :image then build_default_image_content(default)
-    when :link then build_default_link_content(default)
-    when :checkbox then build_default_checkbox_content(default)
-    when :collection_item then build_default_collection_item_content(default)
-    else
-      default || label
+  # shortcuts
+  REGISTERED_TYPES.each do |type|
+    define_method(:"#{type}_type?") do
+      self.type.to_s == type
     end
   end
 
-  def build_default_image_content(default)
-    default.is_a?(String) ? { url: default } : default || {}
+  def cast_value(value)
+    self.class.registered_types[type.to_s].cast_value(value)
   end
 
-  def build_default_link_content(default)
-    if default.is_a?(String)
-      { text: 'Link', link_type: 'url', href: default }
-    else
-      { text: 'Link', link_type: 'url', href: '#' }.merge(default)
-    end
-  end
+  # NOTE: any modification to that method must be reflected in the JS editor
+  def build_default_content(custom_default = nil)
+    default = custom_default.nil? ? self.default : custom_default
 
-  def build_default_checkbox_content(default)
-    default.presence || false
-  end
+    # special case: text type
+    default ||= label if text_type?
 
-  def build_default_collection_item_content(default)
-    { id: default }
+    cast_value(default)
   end
 
   ## class methods ##
@@ -58,5 +49,11 @@ class Maglev::Section::Setting
   def self.build_many(list)
     list.map { |hash| build(hash) }
   end
+
+  def self.registered_types
+    @registered_types ||= REGISTERED_TYPES.index_with do |type|
+      "Maglev::SettingTypes::#{type.camelize}".constantize.new
+    end
+  end
 end
 # rubocop:enable Style/ClassAndModuleChildren

data/app/models/maglev/setting_types/base.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/ClassAndModuleChildren
+class Maglev::SettingTypes::Base
+  def cast_value(value)
+    value
+  end
+end
+
+# rubocop:enable Style/ClassAndModuleChildren

data/app/models/maglev/setting_types/checkbox.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/ClassAndModuleChildren
+class Maglev::SettingTypes::Checkbox < Maglev::SettingTypes::Base
+  def cast_value(value)
+    ActiveModel::Type::Boolean.new.cast(value) || false
+  end
+end
+# rubocop:enable Style/ClassAndModuleChildren

data/app/models/maglev/setting_types/collection_item.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/ClassAndModuleChildren
+class Maglev::SettingTypes::CollectionItem < Maglev::SettingTypes::Base
+  def cast_value(value)
+    if value.is_a?(String)
+      { id: default }
+    else
+      value
+    end
+  end
+end
+# rubocop:enable Style/ClassAndModuleChildren

data/app/models/maglev/setting_types/color.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/ClassAndModuleChildren
+class Maglev::SettingTypes::Color < Maglev::SettingTypes::Base
+end
+# rubocop:enable Style/ClassAndModuleChildren

data/app/models/maglev/setting_types/divider.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/ClassAndModuleChildren
+class Maglev::SettingTypes::Divider < Maglev::SettingTypes::Base
+  def cast_value(_value)
+    nil
+  end
+end
+# rubocop:enable Style/ClassAndModuleChildren

data/app/models/maglev/setting_types/hint.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/ClassAndModuleChildren
+class Maglev::SettingTypes::Hint < Maglev::SettingTypes::Base
+  def cast_value(_value)
+    nil
+  end
+end
+# rubocop:enable Style/ClassAndModuleChildren

data/app/models/maglev/setting_types/icon.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/ClassAndModuleChildren
+class Maglev::SettingTypes::Icon < Maglev::SettingTypes::Base
+  def cast_value(value)
+    value
+  end
+end
+# rubocop:enable Style/ClassAndModuleChildren

data/app/models/maglev/setting_types/image.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/ClassAndModuleChildren
+class Maglev::SettingTypes::Image < Maglev::SettingTypes::Base
+  def cast_value(value)
+    if value.is_a?(String)
+      { url: value }
+    else
+      value || {}
+    end
+  end
+end
+# rubocop:enable Style/ClassAndModuleChildren

data/app/models/maglev/setting_types/link.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/ClassAndModuleChildren
+class Maglev::SettingTypes::Link < Maglev::SettingTypes::Base
+  def cast_value(value)
+    if value.is_a?(String)
+      { text: 'Link', link_type: 'url', href: value }
+    else
+      { text: 'Link', link_type: 'url', href: '#' }.merge(value)
+    end
+  end
+end
+# rubocop:enable Style/ClassAndModuleChildren

data/app/models/maglev/setting_types/select.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/ClassAndModuleChildren
+class Maglev::SettingTypes::Select < Maglev::SettingTypes::Base
+end
+# rubocop:enable Style/ClassAndModuleChildren

data/app/models/maglev/setting_types/text.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/ClassAndModuleChildren
+class Maglev::SettingTypes::Text < Maglev::SettingTypes::Base
+end
+# rubocop:enable Style/ClassAndModuleChildren

data/app/models/maglev/site/locales_concern.rb

@@ -6,12 +6,23 @@ module Maglev::Site::LocalesConcern
 
   included do
     ## serializers ##
-    serialize :locales, LocalesSerializer
+    if Rails::VERSION::MAJOR > 6
+      serialize :locales, coder: LocalesSerializer
+    else
+      serialize :locales, LocalesSerializer
+    end
 
     ## validation ##
     validates :locales, 'maglev/collection': true, length: { minimum: 1 }
   end
 
+  def add_locale(locale)
+    return nil if locale_prefixes.include?(locale.prefix.to_sym)
+
+    locales << locale
+    locales
+  end
+
   def default_locale
     locales.first
   end