@edgedev/create-edge-app 1.1.27 → 1.1.29

package/edge/components/shad/html.vue

@@ -163,6 +163,10 @@ const modelValue = useVModel(props, 'modelValue', emits, {
 })
 
 const editor = ref(null)
+const enterKeyHandler = (event) => {
+  if (event.key === 'Enter')
+    event.stopPropagation()
+}
 const imageState = reactive({
   active: false,
   size: 'medium',
@@ -279,6 +283,7 @@ onMounted(() => {
   })
   editor.value.on('selectionUpdate', updateImageState)
   editor.value.on('transaction', updateImageState)
+  editor.value?.view?.dom?.addEventListener('keydown', enterKeyHandler)
   updateImageState()
   applyHeightClasses()
 })
@@ -287,6 +292,7 @@ onBeforeUnmount(() => {
   if (editor.value) {
     editor.value.off('selectionUpdate', updateImageState)
     editor.value.off('transaction', updateImageState)
+    editor.value?.view?.dom?.removeEventListener('keydown', enterKeyHandler)
     editor.value.destroy()
   }
 })

package/edge/components/shad/number.vue

@@ -84,11 +84,11 @@ const numericValue = computed({
           :disabled="props.disabled"
         >
           <NumberFieldContent>
-            <NumberFieldDecrement class="mt-5" />
+            <NumberFieldDecrement class="" />
             <FormControl>
               <NumberFieldInput />
             </FormControl>
-            <NumberFieldIncrement class="mt-5" />
+            <NumberFieldIncrement class="" />
           </NumberFieldContent>
         </NumberField>
 

package/edge/components/sideBar.vue

@@ -16,7 +16,7 @@ const props = defineProps({
   },
   organizationTitle: {
     type: String,
-    default: 'Organization(s)',
+    default: 'Organization',
   },
   menuItems: {
     type: Array,
@@ -86,7 +86,8 @@ onMounted(() => {
   try {
     devOverride.value = localStorage.getItem(DEV_OVERRIDE_KEY) === '1'
     edgeGlobal.edgeState.devOverride = devOverride.value
-  } catch (error) {
+  }
+  catch (error) {
     console.warn('dev override read failed', error)
   }
 })
@@ -97,10 +98,12 @@ const toggleDevOverride = () => {
   try {
     if (devOverride.value) {
       localStorage.setItem(DEV_OVERRIDE_KEY, '1')
-    } else {
+    }
+    else {
       localStorage.removeItem(DEV_OVERRIDE_KEY)
     }
-  } catch (error) {
+  }
+  catch (error) {
     console.warn('dev override write failed', error)
   }
 }

package/edge/components/sideBarContent.vue

@@ -17,7 +17,7 @@ const props = defineProps({
   },
   organizationTitle: {
     type: String,
-    default: 'Organization(s)',
+    default: 'Organization',
   },
   singleOrg: {
     type: Boolean,

package/edge/components/userMenu.vue

@@ -3,7 +3,7 @@ import { cn } from '@/lib/utils'
 const props = defineProps({
   title: {
     type: String,
-    default: 'Organization(s)',
+    default: 'Organization',
   },
   buttonClass: {
     type: String,
@@ -26,6 +26,20 @@ const isAdmin = computed(() => {
 
   return orgRole && orgRole.role === 'admin'
 })
+const organizations = computed(() => edgeGlobal.edgeState.organizations || [])
+const currentOrg = computed(() => organizations.value.find(org => org.docId === edgeGlobal.edgeState.currentOrganization))
+const currentOrgName = computed(() => currentOrg.value?.name || 'Organization')
+const hasMultipleOrgs = computed(() => organizations.value.length > 1)
+const orgDialogOpen = ref(false)
+const openOrgDialog = () => {
+  if (hasMultipleOrgs.value) {
+    orgDialogOpen.value = true
+  }
+}
+const selectOrg = (orgId) => {
+  edgeGlobal.setOrganization(orgId, edgeFirebase)
+  orgDialogOpen.value = false
+}
 const route = useRoute()
 const router = useRouter()
 const goTo = (path) => {
@@ -69,19 +83,16 @@ const firstPart = computed(() => {
       <DropdownMenuLabel v-if="!props.singleOrg" class="text-xs text-muted-foreground">
         {{ props.title }}
       </DropdownMenuLabel>
-      <template v-for="org in edgeGlobal.edgeState.organizations">
-        <DropdownMenuItem
-          v-if="!props.singleOrg"
-          :key="org.docId"
-          class="cursor-pointer"
-          :class="{ 'bg-accent': org.docId === edgeGlobal.edgeState.currentOrganization }"
-          @click="edgeGlobal.setOrganization(org.docId, edgeFirebase)"
-        >
-          {{ org.name }}
-          <Check v-if="org.docId === edgeGlobal.edgeState.currentOrganization" class="h-3 w-3 mr-2 ml-auto" />
-          <div v-else class="h-3 w-3 mr-2" />
-        </DropdownMenuItem>
-      </template>
+      <DropdownMenuItem
+        v-if="!props.singleOrg"
+        class="cursor-pointer"
+        :disabled="!hasMultipleOrgs"
+        @click="openOrgDialog"
+      >
+        <span class="truncate max-w-[180px]">{{ currentOrgName }}</span>
+        <span v-if="hasMultipleOrgs" class="ml-auto text-xs text-muted-foreground">Switch</span>
+        <ChevronsUpDown v-if="hasMultipleOrgs" class="h-4 w-4 ml-2" />
+      </DropdownMenuItem>
       <template v-if="isAdmin">
         <DropdownMenuSeparator />
         <DropdownMenuLabel class="text-xs text-muted-foreground">
@@ -145,4 +156,29 @@ const firstPart = computed(() => {
       </DropdownMenuItem>
     </DropdownMenuContent>
   </DropdownMenu>
+
+  <edge-shad-dialog v-model="orgDialogOpen">
+    <DialogContent class="w-full max-w-3xl max-h-[80vh] flex flex-col">
+      <DialogHeader>
+        <DialogTitle>Select Organization</DialogTitle>
+        <DialogDescription class="text-left">
+          Choose an organization to switch context.
+        </DialogDescription>
+      </DialogHeader>
+      <div class="mt-4 flex-1 overflow-y-auto">
+        <div class="space-y-2">
+          <edge-shad-button
+            v-for="org in organizations"
+            :key="org.docId"
+            variant="ghost"
+            class="w-full justify-between"
+            @click="selectOrg(org.docId)"
+          >
+            <span class="truncate text-left">{{ org.name }}</span>
+            <Check v-if="org.docId === edgeGlobal.edgeState.currentOrganization" class="h-4 w-4" />
+          </edge-shad-button>
+        </div>
+      </div>
+    </DialogContent>
+  </edge-shad-dialog>
 </template>

package/edge/composables/global.ts

@@ -451,7 +451,10 @@ const cmsCollectionData = async (edgeFirebase: any, value: any, meta: any, curre
           const findIndex = currentQuery.findIndex((q: any) => q.field === queryKey)
           const queryOption = meta[key]?.queryOptions?.find((o: any) => o.field === queryKey)
           const operator = queryOption?.operator || '=='
-          const newQuery = { field: queryKey, operator, value: meta[key].queryItems[queryKey] }
+          let value = meta[key].queryItems[queryKey]
+          if (operator === 'array-contains-any' && !Array.isArray(value))
+            value = [value]
+          const newQuery = { field: queryKey, operator, value }
           if (findIndex > -1) {
             currentQuery[findIndex] = newQuery
           }

package/edge/composables/siteSettingsTemplate.js

@@ -0,0 +1,79 @@
+import { useStructuredDataTemplates } from '@/edge/composables/structuredDataTemplates'
+
+export const useSiteSettingsTemplate = () => {
+  const { buildSiteStructuredData } = useStructuredDataTemplates()
+  const createDefaults = () => ({
+    name: '',
+    theme: '',
+    allowedThemes: [],
+    logo: '',
+    logoLight: '',
+    logoText: '',
+    logoType: 'image',
+    brandLogoDark: '',
+    brandLogoLight: '',
+    favicon: '',
+    menuPosition: 'right',
+    domains: [],
+    contactEmail: '',
+    contactPhone: '',
+    metaTitle: '',
+    metaDescription: '',
+    structuredData: buildSiteStructuredData(),
+    trackingFacebookPixel: '',
+    trackingGoogleAnalytics: '',
+    trackingAdroll: '',
+    socialFacebook: '',
+    socialInstagram: '',
+    socialTwitter: '',
+    socialLinkedIn: '',
+    socialYouTube: '',
+    socialTikTok: '',
+    users: [],
+    aiAgentUserId: '',
+    aiInstructions: '',
+  })
+
+  const createNewDocSchema = () => {
+    const defaults = createDefaults()
+    return {
+      name: { bindings: { 'field-type': 'text', 'label': 'Name' }, cols: '12', value: defaults.name },
+      theme: { bindings: { 'field-type': 'collection', 'label': 'Themes', 'collection-path': 'themes' }, cols: '12', value: defaults.theme },
+      allowedThemes: { bindings: { 'field-type': 'tags', 'label': 'Allowed Themes' }, cols: '12', value: defaults.allowedThemes },
+      logo: { bindings: { 'field-type': 'text', 'label': 'Dark logo' }, cols: '12', value: defaults.logo },
+      logoLight: { bindings: { 'field-type': 'text', 'label': 'Logo Light' }, cols: '12', value: defaults.logoLight },
+      logoText: { bindings: { 'field-type': 'text', 'label': 'Logo Text' }, cols: '12', value: defaults.logoText },
+      logoType: { bindings: { 'field-type': 'select', 'label': 'Logo Type', 'items': ['image', 'text'] }, cols: '12', value: defaults.logoType },
+      brandLogoDark: { bindings: { 'field-type': 'text', 'label': 'Brand Logo Dark' }, cols: '12', value: defaults.brandLogoDark },
+      brandLogoLight: { bindings: { 'field-type': 'text', 'label': 'Brand Logo Light' }, cols: '12', value: defaults.brandLogoLight },
+      favicon: { bindings: { 'field-type': 'text', 'label': 'Favicon' }, cols: '12', value: defaults.favicon },
+      menuPosition: { bindings: { 'field-type': 'select', 'label': 'Menu Position', 'items': ['left', 'center', 'right'] }, cols: '12', value: defaults.menuPosition },
+      domains: { bindings: { 'field-type': 'tags', 'label': 'Domains', 'helper': 'Add or remove domains' }, cols: '12', value: defaults.domains },
+      contactEmail: { bindings: { 'field-type': 'text', 'label': 'Contact Email' }, cols: '12', value: defaults.contactEmail },
+      contactPhone: { bindings: { 'field-type': 'text', 'label': 'Contact Phone' }, cols: '12', value: defaults.contactPhone },
+      metaTitle: { bindings: { 'field-type': 'text', 'label': 'Meta Title' }, cols: '12', value: defaults.metaTitle },
+      metaDescription: { bindings: { 'field-type': 'textarea', 'label': 'Meta Description' }, cols: '12', value: defaults.metaDescription },
+      structuredData: { bindings: { 'field-type': 'textarea', 'label': 'Structured Data (JSON-LD)' }, cols: '12', value: defaults.structuredData },
+      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 },
+      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 },
+      socialLinkedIn: { bindings: { 'field-type': 'text', 'label': 'LinkedIn URL' }, cols: '12', value: defaults.socialLinkedIn },
+      socialYouTube: { bindings: { 'field-type': 'text', 'label': 'YouTube URL' }, cols: '12', value: defaults.socialYouTube },
+      socialTikTok: { bindings: { 'field-type': 'text', 'label': 'TikTok URL' }, cols: '12', value: defaults.socialTikTok },
+      users: { bindings: { 'field-type': 'users', 'label': 'Users', 'hint': 'Choose users' }, cols: '12', value: defaults.users },
+      aiAgentUserId: { bindings: { 'field-type': 'select', 'label': 'Agent Data for AI to use to build initial site' }, cols: '12', value: defaults.aiAgentUserId },
+      aiInstructions: { bindings: { 'field-type': 'textarea', 'label': 'Additional AI Instructions' }, cols: '12', value: defaults.aiInstructions },
+    }
+  }
+
+  const settingsKeys = Object.keys(createDefaults())
+
+  return {
+    createDefaults,
+    createNewDocSchema,
+    settingsKeys,
+  }
+}

package/edge/composables/structuredDataTemplates.js

@@ -0,0 +1,36 @@
+export const useStructuredDataTemplates = () => {
+  const buildSiteStructuredData = () => JSON.stringify({
+    '@context': 'https://schema.org',
+    '@type': 'WebSite',
+    '@id': '{{cms-site}}#website',
+    'name': '',
+    'url': '{{cms-site}}',
+    'description': '',
+    'publisher': {
+      '@type': 'Organization',
+      'name': '',
+      'logo': {
+        '@type': 'ImageObject',
+        'url': '{{cms-logo}}',
+      },
+    },
+    'sameAs': [],
+  }, null, 2)
+
+  const buildPageStructuredData = () => JSON.stringify({
+    '@context': 'https://schema.org',
+    '@type': 'WebPage',
+    '@id': '{{cms-url}}#webpage',
+    'name': '',
+    'url': '{{cms-url}}',
+    'description': '',
+    'isPartOf': {
+      '@id': '{{cms-site}}#website',
+    },
+  }, null, 2)
+
+  return {
+    buildSiteStructuredData,
+    buildPageStructuredData,
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgedev/create-edge-app",
-  "version": "1.1.27",
+  "version": "1.1.29",
   "description": "Create Edge Starter App",
   "bin": {
     "create-edge-app": "./bin/cli.js"