maglevcms 1.4.0 → 1.5.1

data/app/frontend/editor/components/theme-section-list/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <accordion
+    <uikit-accordion
       v-for="(category, index) in categories"
       :key="index"
       headerClass="px-3 py-3 mb-3 bg-editor-primary text-white rounded-sm"
@@ -26,7 +26,7 @@
           {{ $t('themeSectionList.emptyCategory') }}
         </div>
       </div>
-    </accordion>
+    </uikit-accordion>
   </div>
 </template>
 

data/app/frontend/editor/components/theme-section-list/list-item.vue

@@ -25,7 +25,7 @@
       class="bg-white w-full h-16 flex items-center justify-center"
       v-if="isImageNotFound"
     >
-      <icon name="ri-bug-line" />
+      <uikit-icon name="ri-bug-line" />
     </div>
     <div
       class="flex items-center px-2 bg-editor-primary bg-opacity-5 py-4 w-full font-bold text-sm"

data/app/frontend/editor/layouts/slide-pane.vue

@@ -31,7 +31,7 @@
 
           <div class="ml-auto">
             <router-link :to="{ name: 'editPage' }">
-              <icon name="ri-close-circle-line" />
+              <uikit-icon name="ri-close-circle-line" />
             </router-link>
           </div>
         </div>

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

@@ -7,11 +7,14 @@ 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'] : {}
+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),
+  'pt-BR': deepMerge(EditorPTBR, overriddenPTBR),
 }

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

@@ -16,7 +16,7 @@ export const camelize = (str) => {
 
 export const camelizeKeys = (obj) => {
   if (Array.isArray(obj)) {
-    return obj.map(v => camelizeKeys(v));
+    return obj.map((v) => camelizeKeys(v))
   } else if (obj != null && obj.constructor === Object) {
     return Object.keys(obj).reduce(
       (result, key) => ({
@@ -24,12 +24,11 @@ export const camelizeKeys = (obj) => {
         [camelize(key)]: camelizeKeys(obj[key]),
       }),
       {},
-    );
+    )
   }
-  return obj;
+  return obj
 }
 
-
 export const numberToHumanSize = (size, i18n) => {
   if (isBlank(size)) return null
 
@@ -124,9 +123,13 @@ export const hexToRgb = (hex) => {
 
 export const colorVariableToHex = (variable) => {
   if (!variable) return null
-  const color = (variable.startsWith('--')
-    ? getComputedStyle(document.body).getPropertyValue(variable)
-    : variable).trim().toLowerCase()
+  const color = (
+    variable.startsWith('--')
+      ? getComputedStyle(document.body).getPropertyValue(variable)
+      : variable
+  )
+    .trim()
+    .toLowerCase()
   return color === 'transparent' ? '' : color
 }
 

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

@@ -135,6 +135,6 @@ Vue.mixin({
     $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/services/api.js

@@ -1,4 +1,4 @@
-import * as axios from 'axios'
+import axios from 'axios'
 import camelcaseObjectDeep from 'camelcase-object-deep'
 
 let siteHandle = null
@@ -18,7 +18,7 @@ const api = axios.create({
     Accept: 'application/json',
   },
   transformResponse(data) {
-    // for "security" (even if the Rails API already camelcases the JSON), 
+    // 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)) : {}

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

@@ -15,8 +15,12 @@ export default (api) => ({
   create: (attributes) => {
     let formData = new FormData()
     Object.entries(attributes).forEach(([key, value]) =>
-      formData.append(`asset[${key}]`, value),
+      formData.append(`asset[${key}]`, value)
     )
-    return api.post('/assets', formData)
+    return api.post('/assets', formData, {
+      headers: {
+        'Content-Type': 'multipart/form-data'
+      }
+    })
   },
 })

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

@@ -175,6 +175,7 @@ export const getBlockLabel = (block, definition, index) => {
       case 'collection_item':
         if (!label && !isBlank(value?.label)) label = value.label
         if (!image && !isBlank(value?.imageUrl)) image = value.imageUrl
+        break
       default:
         break
     }

data/app/frontend/editor/store/actions/page.js

@@ -3,7 +3,7 @@ import { isBlank } from '@/misc/utils'
 export default (services) => ({
   // editPage : Action triggered when the user wants to edit another page
   // or to change the locale of the current page.
-  editPage({ state, commit, dispatch }, { id, locale }) {
+  editPage({ state, dispatch }, { id, locale }) {
     console.log('editPage', id, locale)
 
     // display the loader

data/app/frontend/editor/store/getters.js

@@ -18,7 +18,7 @@ export default (services) => ({
       }
     })
   },
-  stickySectionList: ({}, { sectionList }) => {
+  stickySectionList: (_, { sectionList }) => {
     return sectionList.filter((section) => section.viewportFixedPosition)
   },
   defaultPageAttributes: ({ page }) => {

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

@@ -15,7 +15,7 @@
           }"
           class="flex items-center"
         >
-          <icon name="arrow-drop-left" />
+          <uikit-icon name="arrow-drop-left" />
           <span class="text-xs">{{ sectionTitle }}</span>
         </router-link>
       </p>
@@ -53,13 +53,17 @@ export default {
       else return null
     },
     sectionTitle() {
-      return this.$st(`${this.currentSectionI18nScope}.name`) || this.currentSectionDefinition?.name
+      return (
+        this.$st(`${this.currentSectionI18nScope}.name`) ||
+        this.currentSectionDefinition?.name
+      )
     },
     sectionBlockTitle() {
-      return this.$st(`${this.currentSectionI18nScope}.blocks.label`) || (
+      return (
+        this.$st(`${this.currentSectionI18nScope}.blocks.label`) ||
         this.currentSectionBlockDefinition?.name +
-        ' ' +
-        `#${this.currentSectionBlockIndex}`
+          ' ' +
+          `#${this.currentSectionBlockIndex}`
       )
     },
     isSectionReady() {

data/app/frontend/editor/views/page-preview.vue

@@ -63,7 +63,11 @@
             class="flex mt-4 text-gray-600"
           >
             <template v-slot:icon>
-              <icon name="add-box-line" size="1.5rem" class="mx-1 text-black" />
+              <uikit-icon
+                name="add-box-line"
+                size="1.5rem"
+                class="mx-1 text-black"
+              />
             </template>
           </i18n>
         </div>

data/app/frontend/editor/views/pages/index.vue

@@ -6,7 +6,7 @@
   >
     <div class="h-full flex flex-col px-4 pb-4">
       <div class="py-2">
-        <search-input
+        <uikit-search-input
           @search="search"
           class="py-4"
           :placeholder="$t('page.list.searchPlaceholder')"

data/app/frontend/live-preview-client/rails.js

@@ -1,4 +1,4 @@
-import * as axios from 'axios'
+import axios from 'axios'
 import { debounce } from './utils'
 import runScripts from './run-scripts'
 

data/app/frontend/live-preview-client/run-scripts.js

@@ -1,54 +1,53 @@
-export default function(element) {
-  var scripts;
+export default function (element) {
+  var scripts
 
   // Get the scripts
-  scripts = element.getElementsByTagName("script");
+  scripts = element.getElementsByTagName('script')
 
   // Run them in sequence (remember NodeLists are live)
-  continueLoading();
+  continueLoading()
 
   function continueLoading() {
-    var script, newscript;
+    var script, newscript
 
     // While we have a script to load...
     while (scripts.length) {
       // Get it and remove it from the DOM
-      script = scripts[0];
-      script.parentNode.removeChild(script);
+      script = scripts[0]
+      script.parentNode.removeChild(script)
 
       // Create a replacement for it
-      newscript = document.createElement('script');
+      newscript = document.createElement('script')
 
       // External?
       if (script.src) {
         // Yes, we'll have to wait until it's loaded before continuing
-        newscript.onerror = continueLoadingOnError;
-        newscript.onload = continueLoadingOnLoad;
-        newscript.onreadystatechange = continueLoadingOnReady;
-        newscript.src = script.src;
-      }
-      else {
+        newscript.onerror = continueLoadingOnError
+        newscript.onload = continueLoadingOnLoad
+        newscript.onreadystatechange = continueLoadingOnReady
+        newscript.src = script.src
+      } else {
         // No, we can do it right away
-        newscript.text = script.text;
+        newscript.text = script.text
       }
 
       // Start the script
-      document.documentElement.appendChild(newscript);
+      document.documentElement.appendChild(newscript)
 
       // If it's external, wait for callback
       if (script.src) {
-        return;
+        return
       }
     }
 
     // All scripts loaded
-    newscript = undefined;
+    newscript = undefined
 
     // Callback on most browsers when a script is loaded
     function continueLoadingOnLoad() {
       // Defend against duplicate calls
       if (this === newscript) {
-        continueLoading();
+        continueLoading()
       }
     }
 
@@ -56,18 +55,17 @@ export default function(element) {
     function continueLoadingOnError() {
       // Defend against duplicate calls
       if (this === newscript) {
-        continueLoading();
+        continueLoading()
       }
     }
 
     // Callback on IE when a script's loading status changes
     function continueLoadingOnReady() {
-
       // Defend against duplicate calls and check whether the
       // script is complete (complete = loaded or error)
-      if (this === newscript && this.readyState === "complete") {
-        continueLoading();
+      if (this === newscript && this.readyState === 'complete') {
+        continueLoading()
       }
     }
   }
-}
+}

data/app/models/maglev/asset.rb

@@ -26,3 +26,17 @@ module Maglev
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: maglev_assets
+#
+#  id           :bigint           not null, primary key
+#  byte_size    :integer
+#  content_type :string
+#  filename     :string
+#  height       :integer
+#  width        :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#

data/app/models/maglev/page/search_concern.rb

@@ -27,7 +27,8 @@ module Maglev::Page::SearchConcern
 
     def search_path_clause(query, locale)
       path = Maglev::PagePath.arel_table[:value]
-      path.matches(query).and(path.eq(locale))
+      path_locale = Maglev::PagePath.arel_table[:locale]
+      path.matches(query).and(path_locale.eq(locale))
     end
 
     def search_title_node(locale)

data/app/models/maglev/page.rb

@@ -42,3 +42,21 @@ module Maglev
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: maglev_pages
+#
+#  id                            :bigint           not null, primary key
+#  lock_version                  :integer
+#  meta_description_translations :jsonb
+#  og_description_translations   :jsonb
+#  og_image_url_translations     :jsonb
+#  og_title_translations         :jsonb
+#  sections_translations         :jsonb
+#  seo_title_translations        :jsonb
+#  title_translations            :jsonb
+#  visible                       :boolean          default(TRUE)
+#  created_at                    :datetime         not null
+#  updated_at                    :datetime         not null
+#

data/app/models/maglev/page_path.rb

@@ -44,3 +44,20 @@ module Maglev
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: maglev_page_paths
+#
+#  id             :bigint           not null, primary key
+#  canonical      :boolean          default(TRUE)
+#  locale         :string           not null
+#  value          :string           not null
+#  maglev_page_id :bigint
+#
+# Indexes
+#
+#  canonical_speed                            (canonical,locale,value)
+#  index_maglev_page_paths_on_maglev_page_id  (maglev_page_id)
+#  scoped_canonical_speed                     (canonical,maglev_page_id,locale)
+#

data/app/models/maglev/site.rb

@@ -27,3 +27,27 @@ module Maglev
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: maglev_sites
+#
+#  id                    :bigint           not null, primary key
+#  domain                :string
+#  handle                :string
+#  locales               :jsonb
+#  lock_version          :integer
+#  name                  :string
+#  navigation            :jsonb
+#  sections_translations :jsonb
+#  siteable_type         :string
+#  style                 :jsonb
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  siteable_id           :bigint
+#  theme_id              :string
+#
+# Indexes
+#
+#  index_maglev_sites_on_siteable  (siteable_type,siteable_id)
+#

data/db/migrate/20200824085207_create_maglev_sites.rb

@@ -1,6 +1,7 @@
 class CreateMaglevSites < ActiveRecord::Migration[6.0]
+  include Maglev::Migration
   def change
-    create_table :maglev_sites do |t|
+    create_table :maglev_sites, id: primary_key_type do |t|
       t.string :name
       t.timestamps
     end

data/db/migrate/20200824104648_create_maglev_pages.rb

@@ -1,6 +1,7 @@
 class CreateMaglevPages < ActiveRecord::Migration[6.0]
+  include Maglev::Migration
   def change
-    create_table :maglev_pages do |t|
+    create_table :maglev_pages, id: primary_key_type do |t|
       t.string :title
       t.string :path
       t.string :seo_title

data/db/migrate/20201206172020_create_maglev_assets.rb

@@ -1,6 +1,7 @@
 class CreateMaglevAssets < ActiveRecord::Migration[6.0]
+  include Maglev::Migration
   def change
-    create_table :maglev_assets do |t|
+    create_table :maglev_assets, id: primary_key_type do |t|
       t.string :filename
       t.string :content_type
       t.integer :width

data/db/migrate/20210830085101_create_maglev_page_paths.rb

@@ -1,7 +1,8 @@
 class CreateMaglevPagePaths < ActiveRecord::Migration[6.0]
+  include Maglev::Migration
   def change
-    create_table :maglev_page_paths do |t|
-      t.references :maglev_page
+    create_table :maglev_page_paths, id: primary_key_type do |t|
+      t.references :maglev_page, type: foreign_key_type
       t.string :locale, null: false
       t.string :value, null: false
     end

data/lib/maglev/engine.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'vite_ruby'
+require 'maglev/migration'
 
 module Maglev
   class Engine < ::Rails::Engine

data/lib/maglev/migration.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Maglev
+  module Migration
+    private
+
+    def primary_key_type
+      primary_key_type_setting || :primary_key
+    end
+
+    def foreign_key_type
+      primary_key_type_setting || :bigint
+    end
+
+    def primary_key_type_setting
+      config = Rails.configuration.generators
+      config.options[config.orm][:primary_key_type]
+    end
+  end
+end

data/lib/maglev/version.rb

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

data/lib/maglev.rb

@@ -54,5 +54,12 @@ module Maglev
     def services(overrides = {})
       ::Maglev::AppContainer.new(config.services.merge(overrides)).call
     end
+
+    def uuid_as_primary_key?
+      return @uuid_as_primary_key unless @uuid_as_primary_key.nil?
+
+      config = Rails.configuration.generators
+      @uuid_as_primary_key = config.options[config.orm][:primary_key_type] == :uuid
+    end
   end
 end

data/lib/tasks/maglev_tasks.rake

@@ -29,7 +29,7 @@ namespace :maglev do
     ARGV.each { |a| task a.to_sym => :environment do; end }
     # rubocop:enable Style/BlockDelimiters
 
-    locales = ARGV[1..].map do |arg|
+    locales = (ARGV[1..] || []).map do |arg|
       label, prefix = arg.split(':')
       Maglev::Site::Locale.new(label: label, prefix: prefix)
     end

data/package.json

@@ -2,11 +2,15 @@
   "name": "maglev",
   "private": true,
   "scripts": {
+    "lint": "eslint --ext .js,.vue app/frontend/editor",
+    "prettier": "prettier --config .prettierrc 'app/frontend/**/*.{vue,js}'",
     "prettier-format": "prettier --config .prettierrc 'app/frontend/**/*.{vue,js}' --write",
     "test": "vitest"
   },
+  "version": "0.1.0",
+  "type": "module",
   "dependencies": {
-    "axios": "^0.21.1",
+    "axios": "^1.6.0",
     "camelcase-object-deep": "^1.1.3",
     "normalizr": "^3.6.1",
     "stimulus": "^2.0.0",
@@ -15,31 +19,29 @@
     "tiptap-extensions": "^1.34.0",
     "turbolinks": "^5.2.0",
     "v-tooltip": "^2.1.3",
-    "vue": "^2.7.13",
+    "vue": "^2.7.15",
     "vue-i18n": "^8.21.1",
     "vue-router": "^3.4.4",
     "vue-window-size": "0.6.2",
     "vuedraggable": "^2.24.3",
     "vuex": "^3.5.1"
   },
-  "version": "0.1.0",
   "devDependencies": {
-    "@vitejs/plugin-vue2": "^2.0.0",
-    "@vue/compiler-dom": "^3.2.41",
+    "@vitejs/plugin-vue2": "^2.3.1",
     "@vue/test-utils": "^1.3.1",
     "autoprefixer": "^10.4.13",
-    "eslint": "^8.26.0",
-    "jsdom": "^20.0.2",
-    "postcss": "^8.4.18",
-    "prettier": "^2.3.2",
-    "sass": "^1.55.0",
+    "eslint": "^8.54.0",
+    "eslint-plugin-vue": "^9.18.1",
+    "eslint-config-prettier": "^9.0.0",
+    "jsdom": "^23.0.0",
+    "prettier": "^3.1.0",
+    "sass": "^1.69.5",
     "tailwindcss": "^3.2.1",
-    "vite": "^4.3.0",
-    "vite-plugin-eslint": "^1.8.1",
-    "vite-plugin-ruby": "^3.2.0",
-    "vite-plugin-vue2-svg": "^0.3.0",
-    "vitest": "^0.24.4",
-    "vue-template-compiler": "^2.7.13"
+    "vite": "^5.0.5",
+    "vite-plugin-ruby": "^5.0.0",
+    "vite-plugin-vue2-svg": "^0.4.0",
+    "vitest": "^0.34.6",
+    "vue-template-compiler": "^2.7.15"
   },
   "resolutions": {
     "prosemirror-model": "^1.11.2",
@@ -49,6 +51,8 @@
     "node-forge": "^1.3.0",
     "minimist": "^1.2.6",
     "eventsource": "^1.1.1",
-    "async": "^2.6.4"
+    "async": "^2.6.4",
+    "postcss": "^8.4.31",
+    "vite": "^5.0.5"
   }
 }

data/{postcss.config.js → postcss.config.cjs}

@@ -1,6 +1,6 @@
 module.exports = {
   plugins: {
     tailwindcss: {},
-    autoprefixer: {},
+    autoprefixer: {}
   }
 }