@goweekdays/layer-common 1.4.2 → 1.4.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @goweekdays/layer-common
 
+## 1.4.4
+
+### Patch Changes
+
+- 7488c0b: Add useLedgerBill
+
+## 1.4.3
+
+### Patch Changes
+
+- 2baee76: Update role and permission components for dynamic app context
+
 ## 1.4.2
 
 ### Patch Changes

package/components/MemberMain.vue

@@ -15,7 +15,13 @@
     </v-col>
 
     <v-col cols="12">
-      <v-card width="100%" variant="outlined" border="thin" rounded="lg">
+      <v-card
+        width="100%"
+        variant="outlined"
+        border="thin"
+        rounded="lg"
+        :loading="loading"
+      >
         <v-toolbar density="compact" color="grey-lighten-4">
           <template #prepend>
             <v-btn fab icon density="comfortable" @click="getAll()">
@@ -62,7 +68,6 @@
           hide-default-header
           hide-default-footer
           style="max-height: calc(100vh - (126px))"
-          :loading="loading"
           @click:row="handleRowClick"
         >
         </v-data-table>

package/components/RoleForm.vue

@@ -268,12 +268,15 @@ const {
   status: permissionsReqStatus,
   refresh: refreshPermissions,
 } = await useLazyAsyncData(
-  `role-form-get-all-permission-${localProps.app}`,
+  `role-form-get-all-permission-${role.value.app}`,
   () =>
     getAllPerm({
-      app: localProps.app,
+      app: role.value.app,
       limit: 200,
-    })
+    }),
+  {
+    watch: [() => role.value.app],
+  }
 );
 
 const loadingPermissions = computed(

package/components/RolePermissionMain.vue

@@ -188,7 +188,7 @@ function setRole({
     JSON.parse(
       JSON.stringify({
         ...data,
-        app: mode === "admin" ? props.app : data.app,
+        app: mode === "admin" || mode === "add" ? props.app : data.app,
       })
     )
   );
@@ -221,16 +221,15 @@ const {
   refresh: getRoles,
   status: getRoleReqStatus,
 } = useLazyAsyncData(
-  "roles-permissions-get-all",
+  `roles-permissions-get-all-by-${props.app}-${props.org}-page-${page.value}`,
   () =>
     _getRoles({
       page: page.value,
-      search: headerSearch.value,
       org: props.org,
       app: isOrg.value ? "" : props.app,
     }),
   {
-    watch: [page, headerSearch],
+    watch: [page],
   }
 );
 

package/components/SwitchContext.vue

@@ -65,7 +65,6 @@
 const prop = defineProps({
   title: {
     type: String,
-    required: true,
     default: "Switch Context",
   },
   items: {

package/composables/useLedgerBilling.ts

@@ -0,0 +1,24 @@
+export default function useLedgerBilling() {
+  function getAll({ org = "", search = "", page = 1, status = "" } = {}) {
+    return $fetch<Record<string, any>>("/api/ledger/billings", {
+      method: "GET",
+      query: {
+        org,
+        search,
+        page,
+        status,
+      },
+    });
+  }
+
+  function getById(id = "") {
+    return $fetch<Record<string, any>>(`/api/ledger/billings/id/${id}`, {
+      method: "GET",
+    });
+  }
+
+  return {
+    getAll,
+    getById,
+  };
+}

package/composables/useVerification.ts

@@ -39,10 +39,22 @@ export default function useUser() {
     });
   }
 
+  function orgSetupFee(
+    value: Pick<TOrg, "name" | "email" | "contact" | "createdBy"> & {
+      seats: number;
+    }
+  ) {
+    return $fetch<Record<string, any>>("/api/verifications/org-setup-fee", {
+      method: "POST",
+      body: value,
+    });
+  }
+
   return {
     getVerifications,
     inviteMember,
     signUp,
     cancelInvite,
+    orgSetupFee,
   };
 }

package/nuxt.config.ts

@@ -61,6 +61,9 @@ export default defineNuxtConfig({
     "/api/plans/**": {
       proxy: `${process.env.API_CORE}/api/plans/**`,
     },
+    "/api/payments/**": {
+      proxy: `${process.env.API_CORE}/api/payments/**`,
+    },
     "/api/members/**": { proxy: `${process.env.API_CORE}/api/members/**` },
     "/api/teams/**": { proxy: `${process.env.API_CORE}/api/teams/**` },
     "/api/entities/**": { proxy: `${process.env.API_CORE}/api/entities/**` },

package/package.json

@@ -2,7 +2,7 @@
   "name": "@goweekdays/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "main": "./nuxt.config.ts",
   "publishConfig": {
     "access": "public"

package/pages/index.vue

@@ -5,18 +5,39 @@
     </v-col>
 
     <v-col cols="12" class="text-center mt-6" v-if="currentUser">
-      <v-row no-gutters justify="center">
-        <v-btn
-          class="text-lowercase"
-          rounded="xl"
-          variant="tonal"
-          size="large"
-          @click="handleSignin()"
-        >
-          <span class="d-inline-block text-truncate" style="width: 300px">
-            Sign-in as {{ currentUser?.email }}
-          </span>
-        </v-btn>
+      <v-row no-gutters>
+        <v-col cols="12" class="mb-2">
+          <v-row no-gutters justify="center">
+            <v-btn
+              class="text-none"
+              rounded="xl"
+              variant="tonal"
+              size="large"
+              @click="handleSignin()"
+            >
+              <span class="d-inline-block text-truncate" style="width: 250px">
+                login as {{ currentUser?.email }}
+              </span>
+            </v-btn>
+          </v-row>
+        </v-col>
+
+        <v-col cols="12">
+          <v-row no-gutters justify="center">
+            <v-btn
+              class="text-none"
+              rounded="xl"
+              variant="flat"
+              color="black"
+              size="large"
+              :to="{ name: 'login' }"
+            >
+              <span class="d-inline-block text-truncate" style="width: 250px">
+                login with another account
+              </span>
+            </v-btn>
+          </v-row>
+        </v-col>
       </v-row>
     </v-col>
 
@@ -31,7 +52,7 @@
             size="large"
             :to="{ name: 'login' }"
           >
-            Sign In
+            Login
           </v-btn>
         </v-col>
 
@@ -64,7 +85,7 @@ const isPartnerApp = computed(() =>
   [
     "org",
     "marketplace",
-    "services",
+    "service",
     "stay",
     "ride",
     "eat",

package/composables/usePayment.ts

@@ -1,22 +0,0 @@
-export default function usePayment() {
-  function getPayments({
-    search = "",
-    id = "",
-    page = 1,
-    status = "completed",
-  } = {}) {
-    return $fetch<Record<string, any>>("/api/payments", {
-      method: "GET",
-      query: {
-        search,
-        id,
-        page,
-        status,
-      },
-    });
-  }
-
-  return {
-    getPayments,
-  };
-}