maglevcms 1.6.1 → 1.7.1

data/.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.4.0.cjs

data/app/frontend/editor/components/kit/modal-root.vue

@@ -10,7 +10,7 @@
       :key="`modal-${index}`"
       :is="modal.component"
       @on-close="handleClose"
-      v-bind="modal.props"
+      v-bind="getModalProps(modal)"
       v-on="modal.listeners"
       v-show="index === stack.length - 1"
     />
@@ -62,7 +62,7 @@ export default {
     },
     containerClass() {
       return this.currentModal?.props?.modalClass
-    },
+    }
   },
   methods: {
     handleOutsideClick(force) {
@@ -76,6 +76,10 @@ export default {
       if (!this.currentModal) return
       this.stack.pop()
     },
+    getModalProps(modal) {
+      const { modalClass, ...rest } = (modal.props ?? {})
+      return rest
+    }
   },
 }
 </script>

data/app/frontend/editor/components/page/edit.vue

@@ -3,12 +3,12 @@
     <uikit-tabs
       :tabs="tabs"
       :otherProps="{ page: editedPage, errors }"
-      navClass="mx-4"
-      panelClass="mx-3"
+      :navClass="!insideModal ? 'mx-4' : 'mx-1'"
+      :panelClass="!insideModal ? 'mx-3' : ''"
       class="overflow-y-hidden pb-4"
       @on-change="onChange"
     />
-    <div class="mt-auto">
+    <div class="mt-auto" :class="{ 'mx-4': !insideModal }">
       <uikit-submit-button
         type="button"
         class="big-submit-button"

data/app/frontend/editor/misc/__tests__/utils.spec.js

@@ -6,3 +6,38 @@ describe('numberToHumanSize', () => {
     expect(utils.numberToHumanSize(2096000, i18n)).toEqual('2.00 MB')
   })
 })
+
+describe('camelize', () => {
+  it('tests a simple case', () => {
+    expect(utils.camelize('foo_bar')).toEqual('fooBar')
+    expect(utils.camelize('foo-bar')).toEqual('fooBar')
+    expect(utils.camelize('fooBar')).toEqual('fooBar')
+    expect(utils.camelize('Foo')).toEqual('foo')
+  })
+});
+
+describe('camelizeKeys', () => {
+  it('tests a simple case', () => {
+    expect(utils.camelizeKeys({ 'foo-bar': true })).to.deep.equal({ fooBar: true })
+  })
+
+  it('tests an array value', () => {
+    expect(utils.camelizeKeys({'Test' : [0,1] })).to.deep.equal({ test: [0, 1] })
+  })
+
+  it('tests a 2 depth object', () => {
+    expect(utils.camelizeKeys({'foo-bar': {'bar-foo' : true}})).to.deep.equal({ fooBar: { barFoo: true } })
+  })
+
+  it('tests a 2 depth object with array value', () => {
+    expect(utils.camelizeKeys({'foo-bar': {'bar-foo' : [{'Test': true}]}})).to.deep.equal({'fooBar': {'barFoo' : [{'test': true}]}})
+  })
+
+  it('accepts an array of objects', () => {
+    expect(utils.camelizeKeys([{foo_bar: true}, {bar_foo: false}, {'bar-foo': 'false'}])).to.deep.equal([{fooBar: true}, {barFoo: false}, {barFoo: 'false'}])
+  })
+
+  it('tests a plain object', () => {
+    expect(utils.camelizeKeys({ a: new Date('2019-06-07T13:32:21.936Z'), b: { cd: 1234, ef: true } })).to.deep.equal({ a: new Date('2019-06-07T13:32:21.936Z'), b: { cd: 1234, ef: true } })
+  })
+});

data/app/frontend/editor/misc/utils.js

@@ -7,11 +7,14 @@ export const isBlank = (object) => {
   )
 }
 
+export const capitalize = (str) => {
+ return str.slice(0, 1).toUpperCase() + str.slice(1);
+}
+
 export const camelize = (str) => {
-  if (!str.includes('_')) return str
   return str
-    .toLowerCase()
-    .replace(/[^a-zA-Z0-9]+(.)/g, (m, chr) => chr.toUpperCase())
+    .replace(/^([A-Z])/, (m, chr) => chr.toLowerCase())
+    .replace(/(?:_|-)([a-z\d]*)/g, (m, chr) => capitalize(chr))
 }
 
 export const camelizeKeys = (obj) => {
@@ -171,4 +174,4 @@ export const hasAnyChanged = (newObject, oldObject, ...properties) => {
   return properties.some((property) =>
     hasChanged(newObject, oldObject, property),
   )
-}
+}

data/app/frontend/editor/services/api.js

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import camelcaseObjectDeep from 'camelcase-object-deep'
+import { camelizeKeys } from '@/misc/utils'
 
 let siteHandle = null
 let locale = null
@@ -21,7 +21,7 @@ const api = axios.create({
     // for "security" (even if the Rails API already camelcases the JSON),
     // we also camelcase the response in the Editor.
     // console.log('[DEBUG] API response', data)
-    return data ? camelcaseObjectDeep(JSON.parse(data)) : {}
+    return data ? camelizeKeys(JSON.parse(data)) : {}
   },
 })
 

data/config/locales/activerecord.es.yml

@@ -0,0 +1,26 @@
+es:
+  activerecord:
+    models:
+      'maglev/page': Página
+
+    attributes:
+      'maglev/page':
+        title: Título
+        cloned_title: "%{title} COPIA"
+        seo_title: Título SEO
+        meta_description: Meta descripción
+        og_title: "og:title"
+        og_description: "og:description"
+        og_image_url: "og:image"
+      'maglev/page/paths':
+        value: Ruta
+
+    errors:
+      models:
+        maglev/page:
+          attributes:
+            title:
+              blank: no puede estar en blanco
+            path:
+              taken: ya está en uso por otra página
+              exclusion: ya está en uso por otra página

data/lib/generators/maglev/templates/install/config/initializers/maglev.rb

@@ -19,7 +19,7 @@ Maglev.configure do |config|
   # config.favicon = ->(site) { ActionController::Base.helpers.vite_asset_path('favicon.png') }
 
   # Primary color of the Editor
-  # config.primary_color = '#7E6EDB'
+  # config.primary_color = '#040712'
 
   # Action triggered when clicking on the very bottom left button in the Editor
   # NOTE: If you want the user to signed out from the Editor UI once the back action has been triggered,

data/lib/maglev/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Maglev
-  VERSION = '1.6.1'
+  VERSION = '1.7.1'
 end

data/lib/maglev.rb

@@ -25,7 +25,7 @@ module Maglev
         c.title = 'Maglev - EDITOR'
         c.favicon = nil
         c.logo = nil
-        c.primary_color = '#7E6EDB'
+        c.primary_color = '#040712'
         c.uploader = 'active_storage'
         c.site_publishable = false
         c.preview_host = nil

data/package.json

@@ -10,8 +10,7 @@
   "version": "0.1.0",
   "type": "module",
   "dependencies": {
-    "axios": "^1.6.8",
-    "camelcase-object-deep": "^1.1.3",
+    "axios": "^1.7.4",
     "normalizr": "^3.6.1",
     "stimulus": "^2.0.0",
     "stimulus-vite-helpers": "^3.0.1",
@@ -29,11 +28,12 @@
   "devDependencies": {
     "@vitejs/plugin-vue2": "^2.3.1",
     "@vue/test-utils": "^1.3.1",
-    "autoprefixer": "^10.4.13",
+    "autoprefixer": "^10.4.20",
     "eslint": "^8.54.0",
-    "eslint-plugin-vue": "^9.18.1",
     "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-vue": "^9.18.1",
     "jsdom": "^23.0.0",
+    "postcss": "^8.4.40",
     "prettier": "^3.1.0",
     "sass": "^1.69.5",
     "tailwindcss": "^3.4.1",
@@ -41,7 +41,7 @@
     "vite-plugin-ruby": "^5.0.0",
     "vite-plugin-vue2-svg": "^0.4.0",
     "vitest": "^0.34.6",
-    "vue-template-compiler": "^2.7.15"
+    "vue-template-compiler": "^2.7.16"
   },
   "resolutions": {
     "prosemirror-model": "^1.11.2",
@@ -52,7 +52,7 @@
     "minimist": "^1.2.6",
     "eventsource": "^1.1.1",
     "async": "^2.6.4",
-    "postcss": "^8.4.31",
     "vite": "^5.0.5"
-  }
+  },
+  "packageManager": "yarn@4.4.0"
 }