@edgedev/create-edge-app 1.2.33 → 1.2.35

package/edge/composables/global.ts

@@ -439,22 +439,54 @@ const allowMenuItem = (item: any, isAdmin: boolean) => {
   return true
 }
 
+const resolveCmsCollectionTokens = (input: any, currentSite: any = '') => {
+  const orgId = String(edgeState.currentOrganization || '')
+  const siteId = String(currentSite || '')
+
+  const replaceTokens = (raw: string) => {
+    let resolved = raw
+    if (orgId && resolved.includes('{orgId}'))
+      resolved = resolved.replaceAll('{orgId}', orgId)
+    if (siteId && resolved.includes('{siteId}'))
+      resolved = resolved.replaceAll('{siteId}', siteId)
+    return resolved
+  }
+
+  const walk = (value: any): any => {
+    if (typeof value === 'string')
+      return replaceTokens(value)
+    if (Array.isArray(value))
+      return value.map(item => walk(item))
+    if (value && typeof value === 'object') {
+      const out: Record<string, any> = {}
+      for (const [key, child] of Object.entries(value))
+        out[key] = walk(child)
+      return out
+    }
+    return value
+  }
+
+  return walk(input)
+}
+
 const cmsCollectionData = async (edgeFirebase: any, value: any, meta: any, currentSite: any = '') => {
   for (const key in meta) {
     if (meta[key]?.collection) {
       const staticSearch = new edgeFirebase.SearchStaticData()
 
-      const currentQuery = meta[key].collection.query || []
+      const currentQuery = Array.isArray(meta[key].collection.query)
+        ? resolveCmsCollectionTokens(dupObject(meta[key].collection.query), currentSite)
+        : []
       for (const queryKey in meta[key].queryItems || {}) {
         console.log('key', queryKey)
         if (meta[key].queryItems[queryKey]) {
           const findIndex = currentQuery.findIndex((q: any) => q.field === queryKey)
           const queryOption = meta[key]?.queryOptions?.find((o: any) => o.field === queryKey)
           const operator = queryOption?.operator || '=='
-          let value = meta[key].queryItems[queryKey]
-          if (operator === 'array-contains-any' && !Array.isArray(value))
-            value = [value]
-          const newQuery = { field: queryKey, operator, value }
+          let queryValue = resolveCmsCollectionTokens(meta[key].queryItems[queryKey], currentSite)
+          if (operator === 'array-contains-any' && !Array.isArray(queryValue))
+            queryValue = [queryValue]
+          const newQuery = { field: queryKey, operator, value: queryValue }
           if (findIndex > -1) {
             currentQuery[findIndex] = newQuery
           }

package/edge/composables/siteSettingsTemplate.js

@@ -24,6 +24,7 @@ export const useSiteSettingsTemplate = () => {
     trackingFacebookPixel: '',
     trackingGoogleAnalytics: '',
     trackingAdroll: '',
+    sureFeedURL: '',
     socialFacebook: '',
     socialInstagram: '',
     socialTwitter: '',
@@ -59,6 +60,7 @@ export const useSiteSettingsTemplate = () => {
       trackingFacebookPixel: { bindings: { 'field-type': 'text', 'label': 'Facebook Pixel ID' }, cols: '12', value: defaults.trackingFacebookPixel },
       trackingGoogleAnalytics: { bindings: { 'field-type': 'text', 'label': 'Google Analytics ID' }, cols: '12', value: defaults.trackingGoogleAnalytics },
       trackingAdroll: { bindings: { 'field-type': 'text', 'label': 'AdRoll ID' }, cols: '12', value: defaults.trackingAdroll },
+      sureFeedURL: { bindings: { 'field-type': 'text', 'label': 'Sure Feedback' }, cols: '12', value: defaults.sureFeedURL },
       socialFacebook: { bindings: { 'field-type': 'text', 'label': 'Facebook URL' }, cols: '12', value: defaults.socialFacebook },
       socialInstagram: { bindings: { 'field-type': 'text', 'label': 'Instagram URL' }, cols: '12', value: defaults.socialInstagram },
       socialTwitter: { bindings: { 'field-type': 'text', 'label': 'X (Twitter) URL' }, cols: '12', value: defaults.socialTwitter },

package/edge/composables/useCmsNewDocs.js

@@ -0,0 +1,100 @@
+export const useCmsNewDocs = () => {
+  const { createDefaults: createSiteSettingsDefaults } = useSiteSettingsTemplate()
+
+  const blocks = useState('edge-cms-new-docs-blocks', () => ({
+    name: { value: '' },
+    content: { value: '' },
+    tags: { value: [] },
+    themes: { value: [] },
+    previewType: { value: 'light' },
+    synced: { value: false },
+    version: 1,
+  }))
+
+  const themes = useState('edge-cms-new-docs-themes', () => ({
+    name: { value: '' },
+    headJSON: {
+      value: `{
+  "link": [
+    {
+      "rel": "preconnect",
+      "href": "https://fonts.googleapis.com"
+    },
+    {
+      "rel": "preconnect",
+      "href": "https://fonts.gstatic.com",
+      "crossorigin": ""
+    },
+    {
+      "rel": "stylesheet",
+      "href": "https://fonts.googleapis.com/css2?family=Overpass:wght@400;700&family=Kode+Mono:wght@400;700&display=swap"
+    }
+  ]
+}`,
+    },
+    theme: {
+      value: `{
+  "extend": {
+    "colors": {
+      "brand": "#3B82F6",
+      "accent": "#F59E0B",
+      "surface": "#FAFAFA",
+      "subtle": "#F3F4F6",
+      "text": "#1F2937",
+      "muted": "#9CA3AF",
+      "success": "#22C55E",
+      "danger": "#EF4444",
+      "border": "#E5E7EB",
+      "ring": "#93C5FD",
+      "link": "#3B82F6",
+      "linkHover": "#1D4ED8",
+      "navBg": "#000000",
+      "navText": "#FFFFFF",
+      "navMuted": "#6B7280",
+      "navBorder": "",
+      "navActive": "#3B82F6",
+      "navHoverBg": "",
+      "navActiveBg": "",
+      "sideNavBg": "#FFFFFF",
+      "sideNavText": "#000000",
+      "sideNavActive": "#AFBD23"
+    },
+    "fontFamily": {
+      "sans": ["Overpass", "sans-serif"],
+      "serif": ["Kode Mono", "monospace"],
+      "mono": ["Overpass", "sans-serif"],
+      "brand": ["Kode Mono", "monospace"]
+    }
+  },
+  "apply": {},
+  "slots": {},
+  "variants": {
+    "light": {
+      "apply": {}
+    },
+    "dark": {
+      "apply": {},
+      "slots": {}
+    }
+  }
+}`,
+    },
+    extraCSS: {
+      value: '',
+    },
+    version: 1,
+    defaultPages: { value: [] },
+    defaultMenus: {
+      value: {
+        'Site Root': [],
+        'Not In Menu': [],
+      },
+    },
+    defaultSiteSettings: { value: createSiteSettingsDefaults() },
+  }))
+
+  return {
+    blocks,
+    themes,
+  }
+}

package/edge/composables/useEdgeCmsDialogPositionFix.js

@@ -0,0 +1,19 @@
+import { useHead } from '#imports'
+
+export const useEdgeCmsDialogPositionFix = () => {
+  useHead({
+    style: [
+      {
+        key: 'edge-cms-dialog-position-fix',
+        id: 'edge-cms-dialog-position-fix',
+        children: `
+.fixed.left-1\\/2.top-1\\/2.-translate-x-1\\/2.-translate-y-1\\/2 {
+  translate: initial !important;
+  --un-translate-x: initial !important;
+  --un-translate-y: initial !important;
+}
+        `,
+      },
+    ],
+  })
+}

package/edge/routes/cms/dashboard/blocks/[block].vue

@@ -1,9 +1,14 @@
 <script setup>
+import { useEdgeCmsDialogPositionFix } from '~/edge/composables/useEdgeCmsDialogPositionFix'
+
 const route = useRoute()
 const state = reactive({
   mounted: false,
   head: null,
 })
+
+useEdgeCmsDialogPositionFix()
+
 definePageMeta({
   middleware: 'auth',
 })

package/edge/routes/cms/dashboard/blocks/index.vue

@@ -1,21 +1,32 @@
 <script setup>
+import { useEdgeCmsDialogPositionFix } from '~/edge/composables/useEdgeCmsDialogPositionFix'
+
 const state = reactive({
   mounted: false,
+  head: null,
 })
 
+useEdgeCmsDialogPositionFix()
+
 definePageMeta({
   middleware: 'auth',
 })
 
+useHead(() => (state.head || {}))
+
 onMounted(() => {
   state.mounted = true
 })
+
+const setHead = (newHead) => {
+  state.head = newHead
+}
 </script>
 
 <template>
   <div
     v-if="edgeGlobal.edgeState.organizationDocPath && state.mounted"
   >
-    <edge-cms-blocks-manager />
+    <edge-cms-blocks-manager @head="setHead" />
   </div>
 </template>

package/edge/routes/cms/dashboard/media/index.vue

@@ -1,7 +1,12 @@
 <script setup>
+import { useEdgeCmsDialogPositionFix } from '~/edge/composables/useEdgeCmsDialogPositionFix'
+
 const state = reactive({
   mounted: false,
 })
+
+useEdgeCmsDialogPositionFix()
+
 definePageMeta({
   middleware: 'auth',
 })

package/edge/routes/cms/dashboard/sites/[site]/[[page]].vue

@@ -1,4 +1,6 @@
 <script setup>
+import { useEdgeCmsDialogPositionFix } from '~/edge/composables/useEdgeCmsDialogPositionFix'
+
 const route = useRoute()
 
 // const edgeGlobal = inject('edgeGlobal')
@@ -8,6 +10,8 @@ const state = reactive({
   head: null,
 })
 
+useEdgeCmsDialogPositionFix()
+
 const page = computed(() => {
   if (route.params?.page) {
     return route.params.page

package/edge/routes/cms/dashboard/sites/[site].vue

@@ -1,4 +1,6 @@
 <script setup>
+import { useEdgeCmsDialogPositionFix } from '~/edge/composables/useEdgeCmsDialogPositionFix'
+
 const route = useRoute()
 
 // const edgeGlobal = inject('edgeGlobal')
@@ -7,6 +9,8 @@ const state = reactive({
   mounted: false,
 })
 
+useEdgeCmsDialogPositionFix()
+
 const page = computed(() => {
   if (route.params?.page) {
     return route.params.page

package/edge/routes/cms/dashboard/sites/index.vue

@@ -1,4 +1,8 @@
 <script setup>
+import { useEdgeCmsDialogPositionFix } from '~/edge/composables/useEdgeCmsDialogPositionFix'
+
+useEdgeCmsDialogPositionFix()
+
 definePageMeta({
   middleware: 'auth',
 })

package/edge/routes/cms/dashboard/templates/[page].vue

@@ -1,4 +1,6 @@
 <script setup>
+import { useEdgeCmsDialogPositionFix } from '~/edge/composables/useEdgeCmsDialogPositionFix'
+
 const route = useRoute()
 
 const state = reactive({
@@ -6,6 +8,8 @@ const state = reactive({
   head: null,
 })
 
+useEdgeCmsDialogPositionFix()
+
 const page = computed(() => {
   if (route.params?.page) {
     return route.params.page

package/edge/routes/cms/dashboard/templates/index.vue

@@ -1,4 +1,6 @@
 <script setup>
+import { useEdgeCmsDialogPositionFix } from '~/edge/composables/useEdgeCmsDialogPositionFix'
+
 const route = useRoute()
 
 // const edgeGlobal = inject('edgeGlobal')
@@ -7,6 +9,8 @@ const state = reactive({
   mounted: false,
 })
 
+useEdgeCmsDialogPositionFix()
+
 const page = computed(() => {
   if (route.params?.page) {
     return route.params.page

package/edge/routes/cms/dashboard/themes/[theme].vue

@@ -1,8 +1,13 @@
 <script setup>
+import { useEdgeCmsDialogPositionFix } from '~/edge/composables/useEdgeCmsDialogPositionFix'
+
 const route = useRoute()
 const state = reactive({
   mounted: false,
 })
+
+useEdgeCmsDialogPositionFix()
+
 definePageMeta({
   middleware: 'auth',
   head: null,