@edgedev/create-edge-app 1.0.39 → 1.0.40

package/components/account.vue

@@ -1,5 +1,8 @@
 <script setup>
+import { useRoute, useRouter } from 'vue-router'
+
 const route = useRoute()
+const router = useRouter()
 const edgeGlobal = inject('edgeGlobal')
 const site = computed(() => {
   return route.params.collection
@@ -27,16 +30,17 @@ const config = useRuntimeConfig()
 </script>
 
 <template>
-  <v-card>
-    <v-toolbar flat>
+  <v-card :rounded="0">
+    <sub-toolbar>
       <v-icon class="mx-4">
-        mdi-account-group-outline
+        mdi-account
       </v-icon>
-      {{ edgeGlobal.currentOrganizationObject.name }}
-    </v-toolbar>
+      Account Settings
+    </sub-toolbar>
     <v-card-text>
       <v-row>
-        <v-col cols="3">
+        <v-col cols="12" sm="3" class="d-none d-sm-block">
+          <!-- Desktop sidebar -->
           <v-card>
             <v-list :lines="false" density="compact" nav>
               <v-list-subheader class="">
@@ -51,7 +55,6 @@ const config = useRuntimeConfig()
               </v-list-item>
             </v-list>
             <v-divider />
-
             <v-list :lines="false" density="compact" nav>
               <v-list-subheader class="">
                 My Settings
@@ -63,20 +66,34 @@ const config = useRuntimeConfig()
               <v-list-item link to="/app/account/my-account">
                 <v-list-item-title>Account</v-list-item-title>
               </v-list-item>
-              <v-list-item link to="/app/account/my-organizations">
-                <v-list-item-title>Organizations</v-list-item-title>
-              </v-list-item>
             </v-list>
 
             <v-divider />
           </v-card>
         </v-col>
-        <v-col cols="9">
+        <v-col cols="12" sm="9">
+          <!-- Mobile tabs -->
+          <v-tabs v-model="site" center-active show-arrows class="d-sm-none">
+            <v-tab key="org-settings" value="org-settings" to="/app/account/organization-settings">
+              Org Settings
+            </v-tab>
+            <v-tab key="org-members" value="org-members" to="/app/account/organization-members">
+              Org Members
+            </v-tab>
+            <v-tab key="my-profile" value="my-profile" to="/app/account/my-profile">
+              Profile
+            </v-tab>
+            <v-tab key="my-account" value="my-account" to="/app/account/my-account">
+              Account
+            </v-tab>
+          </v-tabs>
+          <!-- Content -->
           <edge-organization-settings v-if="site === 'organization-settings'" :org-fields="orgFields" />
           <edge-my-account v-if="site === 'my-account'" />
           <edge-my-profile v-if="site === 'my-profile'" :meta-fields="metaFields" />
           <edge-organization-members v-if="site === 'organization-members'" />
           <edge-my-organizations v-if="site === 'my-organizations'" :registration-code="config.public.registrationCode" />
+          <billing v-if="site === 'subscription'" />
         </v-col>
       </v-row>
     </v-card-text>

package/components/billing.vue

@@ -0,0 +1,8 @@
+<script setup>
+</script>
+
+<template>
+  <div>
+    <v-card v-if="globalState.subscribedStatus.isSubscribed" outlined />
+  </div>
+</template>

package/components/subToolbar.vue

@@ -0,0 +1,24 @@
+<script setup>
+const el = ref(null)
+const edgeFirebase = inject('edgeFirebase')
+const user = computed(() => {
+  return edgeFirebase.user
+})
+watch (el, async () => {
+  if (user.value.loggedIn) {
+    globalState.secondHeaderHeight = el.value.$el.offsetHeight
+  }
+})
+</script>
+
+<template>
+  <v-layout-item ref="el" model-value position="top" class="text-center van-safe-area-top" size="64">
+    <v-toolbar flat class="px-4">
+      <slot />
+    </v-toolbar>
+  </v-layout-item>
+</template>
+
+<style lang="scss" scoped>
+
+</style>

package/nuxt.config.ts

@@ -13,6 +13,9 @@ export default defineNuxtConfig({
       registrationCode: process.env.REGISTRATION_CODE,
     },
   },
+  modules: [
+    '@vant/nuxt',
+  ],
   components: {
     dirs: [
       { path: '~/components/formSubtypes', global: true, prefix: 'form-subtypes' },
@@ -24,4 +27,5 @@ export default defineNuxtConfig({
       'process.env.DEBUG': false,
     },
   },
+  devtools: { enabled: false },
 })

package/package.json

@@ -1,14 +1,14 @@
 {
     "name": "@edgedev/create-edge-app",
-    "version": "1.0.39",
+    "version": "1.0.40",
     "description": "Create Edge Starter App",
     "bin": {
         "create-edge-app": "./bin/cli.js"
     },
     "scripts": {
         "build": "nuxt build",
-        "dev": "nuxt dev",
-        "emulator": "nuxt dev --dotenv .env.dev",
+        "dev": "nuxt dev --host",
+        "emulator": "nuxt dev --dotenv .env.dev --host",
         "build-emulator": "nuxt generate --dotenv .env.dev",
         "generate": "nuxt generate",
         "preview": "nuxt preview",
@@ -24,10 +24,11 @@
         "@vant/nuxt": "1.0.3",
         "eslint": "8.33.0",
         "firebase": "9.17.1",
-        "nuxt": "3.1.2",
+        "nuxt": "3.9.3",
         "sass": "1.58.0",
         "typescript": "4.9.5",
-        "vuedraggable": "4.1.0"
+        "vuedraggable": "4.1.0",
+        "vuetify": "^3.5.1"
     },
     "dependencies": {
         "@capacitor/android": "5.4.1",
@@ -38,7 +39,6 @@
         "@chenfengyuan/vue-number-input": "2",
         "@edgedev/firebase": "latest",
         "@vueuse/core": "10.4.1",
-        "maska": "2.1.9",
-        "vuetify": "3.3.19"
+        "maska": "2.1.9"
     }
 }