@edgedev/create-edge-app 1.0.60 → 1.0.61

package/app.vue

@@ -121,15 +121,7 @@ const menuItems = [
 <template>
   <Toaster />
   <div class="flex flex-col h-screen">
-    <!-- <edge-menu v-if="edgeFirebase.user.loggedIn" type="header" nav-class="justify-start" class="bg-slate-300 dark:bg-slate-900" :menu-items="menuItems">
-      <template #start>
-        <Package class="h-6 w-6 mr-2" />
-        <h1 class="text-xl font-bold">
-          {{ orgName }}
-        </h1>
-      </template>
-    </edge-menu> -->
-    <div class="flex h-full">
+    <div class="flex h-full w-full">
       <SidebarProvider>
         <div class="h-full">
           <edge-side-menu
@@ -163,33 +155,37 @@ const menuItems = [
             </template>
           </edge-side-menu>
         </div>
-        <div class="grow h-full">
-          <div class="flex justify-between p-1">
-            <div>
-              <!-- possible breadcrumbs -->
-            </div>
-            <div>
-              <edge-user-menu v-if="edgeFirebase.user.loggedIn" :title="orgName" button-class="w-8 h-8" icon-class="w-6 h-6" />
-            </div>
-          </div>
-          <NuxtPage keepalive />
+        <div class="grow h-full flex flex-col h-screen">
+          <edge-menu
+            v-if="edgeFirebase.user.loggedIn"
+            type="nav"
+            nav-class="justify-left mr-8"
+            :menu-items="menuItems"
+          >
+            <template #start>
+              <SidebarTrigger class="-ml-2 mr-2 h-4 w-4" />
+              <Package class="h-6 w-6 mr-2" />
+              <h1 class="text-xl font-bold">
+                {{ orgName }}
+              </h1>
+            </template>
+          </edge-menu>
+          <NuxtPage class="flex-1 flex flex-col overflow-y-auto p-3" keepalive />
+          <edge-menu
+            v-if="edgeFirebase.user.loggedIn"
+            type="footer"
+            nav-class="justify-end mr-8"
+            :menu-items="menuItems"
+          >
+            <template #start>
+              <div class="text-xs text-muted-foreground">
+                Copyright {{ new Date().getFullYear() }}
+              </div>
+            </template>
+          </edge-menu>
         </div>
       </SidebarProvider>
     </div>
-    <!-- <edge-menu
-      v-if="edgeFirebase.user.loggedIn"
-      type="footer"
-      button-class="text-slate-500"
-      nav-class="justify-end mr-8"
-      class="bg-slate-800"
-      :menu-items="menuItems"
-    >
-      <template #start>
-        <div class="text-xs text-muted-foreground">
-          Copyright {{ new Date().getFullYear() }}
-        </div>
-      </template>
-    </edge-menu> -->
   </div>
 </template>
 

package/package.json

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

package/pages/app/account/[page].vue

@@ -56,17 +56,14 @@ const page = computed(() => {
 <template>
   <div
     v-if="edgeFirebase?.user?.loggedIn"
-    class="p-3 w-full h-[calc(100vh-118px)] overflow-y-auto"
   >
-    <div class="gap-2 h-full w-full justify-items-center">
-      <Card class="w-full h-full bg-muted/50 max-w-7xl m-auto pt-3">
-        <edge-organization-settings v-if="page === 'organization-settings'" :form-schema="orgSchema" :org-fields="orgFields" />
-        <edge-my-account v-if="page === 'my-account'" />
-        <edge-my-profile v-if="page === 'my-profile'" :form-schema="metaSchema" :meta-fields="metaFields" />
-        <edge-organization-members v-if="page === 'organization-members'" />
-        <edge-my-organizations v-if="page === 'my-organizations'" :registration-code="config.public.registrationCode" />
-        <edge-billing v-if="page === 'subscription'" />
-      </Card>
-    </div>
+    <Card class="w-full flex-1 bg-muted/50 max-w-7xl m-auto ">
+      <edge-organization-settings v-if="page === 'organization-settings'" :subscribe-options="subscribeOptions" :form-schema="orgSchema" :org-fields="orgFields" />
+      <edge-my-account v-if="page === 'my-account'" />
+      <edge-my-profile v-if="page === 'my-profile'" :form-schema="metaSchema" :meta-fields="metaFields" />
+      <edge-organization-members v-if="page === 'organization-members'" />
+      <edge-my-organizations v-if="page === 'my-organizations'" :registration-code="config.public.registrationCode" />
+      <edge-billing v-if="page === 'subscription'" />
+    </Card>
   </div>
 </template>

package/pages/app/dashboard/[[collection]]/[[docId]].vue

@@ -73,9 +73,8 @@ onMounted(() => {
 <template>
   <div
     v-if="edgeFirebase?.user?.loggedIn"
-    class="p-3 w-full h-[calc(100vh-118px)] overflow-y-auto"
   >
-    <edge-dashboard v-if="docId === '' && collection !== ''" :filter="state.filter" :collection="collection">
+    <edge-dashboard v-if="docId === ''" :filter="state.filter" :collection="collection" class="flex-1">
       <template #header-start>
         <LayoutDashboard class="mr-2" />
         <span class="capitalize">{{ collection }}</span>
@@ -126,6 +125,7 @@ onMounted(() => {
       :doc-id="docId"
       :schema="schemas[collection]"
       :new-doc-schema="state.newDocs[collection]"
+      class="w-full max-w-7xl mx-auto flex-1"
     >
       <template #header-start="slotProps">
         <FilePenLine class="mr-2" />