@goweekdays/layer-common 1.2.4 → 1.2.5

package/composables/useOrg.ts

@@ -1,6 +1,6 @@
 export default function useOrg() {
   function getAll({ page = 1, search = "", limit = 20, status = "" } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/organizations", {
+    return $fetch<Record<string, any>>("/api/organizations", {
       method: "GET",
       query: {
         page,
@@ -12,26 +12,20 @@ export default function useOrg() {
   }
 
   function getById(id = "") {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/organizations/id/${id}`,
-      {
-        method: "GET",
-      }
-    );
+    return $fetch<Record<string, any>>(`/api/organizations/id/${id}`, {
+      method: "GET",
+    });
   }
 
   function getByUserId({ page = 1, search = "", user = "", limit = 20 } = {}) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/organizations/user/${user}`,
-      {
-        method: "GET",
-        query: {
-          page,
-          search,
-          limit,
-        },
-      }
-    );
+    return $fetch<Record<string, any>>(`/api/organizations/user/${user}`, {
+      method: "GET",
+      query: {
+        page,
+        search,
+        limit,
+      },
+    });
   }
 
   const org = ref({
@@ -77,7 +71,7 @@ export default function useOrg() {
   const total = computed(() => seats.value * perSeatPrice);
 
   function getByName(name = "") {
-    return useNuxtApp().$api<TOrg>(`/api/organizations/name/${name}`, {
+    return $fetch<TOrg>(`/api/organizations/name/${name}`, {
       method: "GET",
     });
   }

package/composables/usePayment.ts

@@ -5,7 +5,7 @@ export default function usePayment() {
     page = 1,
     status = "completed",
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/payments", {
+    return $fetch<Record<string, any>>("/api/payments", {
       method: "GET",
       query: {
         search,

package/composables/usePaymentMethod.ts

@@ -9,20 +9,17 @@ export default function usePaymentMethod() {
     cancel_return_url = "",
     category = "individual",
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>(
-      "/api/payment-methods/e-wallet",
-      {
-        method: "POST",
-        body: {
-          customer_id,
-          type,
-          success_return_url,
-          failure_return_url,
-          cancel_return_url,
-          category,
-        },
-      }
-    );
+    return $fetch<Record<string, any>>("/api/payment-methods/e-wallet", {
+      method: "POST",
+      body: {
+        customer_id,
+        type,
+        success_return_url,
+        failure_return_url,
+        cancel_return_url,
+        category,
+      },
+    });
   }
 
   function linkCard({
@@ -37,7 +34,7 @@ export default function usePaymentMethod() {
     failure_return_url = "",
     subscriptionData = {},
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/payment-methods/card", {
+    return $fetch<Record<string, any>>("/api/payment-methods/card", {
       method: "POST",
       body: {
         cardType,
@@ -55,7 +52,7 @@ export default function usePaymentMethod() {
   }
 
   function getByUser(user = "") {
-    return useNuxtApp().$api<Array<Record<string, any>>>(
+    return $fetch<Array<Record<string, any>>>(
       `/api/payment-methods/user/${user}`,
       {
         method: "GET",
@@ -64,7 +61,7 @@ export default function usePaymentMethod() {
   }
 
   function getByOrg(org = "") {
-    return useNuxtApp().$api<Array<Record<string, any>>>(
+    return $fetch<Array<Record<string, any>>>(
       `/api/payment-methods/org/${org}`,
       {
         method: "GET",
@@ -73,15 +70,11 @@ export default function usePaymentMethod() {
   }
 
   function getById(id = "") {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/payment-methods/id/${id}`
-    );
+    return $fetch<Record<string, any>>(`/api/payment-methods/id/${id}`);
   }
 
   function getByCustomerId(id = "") {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/payment-methods/customer/${id}`
-    );
+    return $fetch<Record<string, any>>(`/api/payment-methods/customer/${id}`);
   }
 
   const eWalletNumber = useState("eWalletNumber", () => "");
@@ -94,13 +87,10 @@ export default function usePaymentMethod() {
   const selectedPaymentMethod = useState("selectedPaymentMethod", () => "");
 
   function linkOnly(value: Record<string, any>) {
-    return useNuxtApp().$api<Record<string, any>>(
-      "/api/payment-methods/link-only",
-      {
-        method: "POST",
-        body: value,
-      }
-    );
+    return $fetch<Record<string, any>>("/api/payment-methods/link-only", {
+      method: "POST",
+      body: value,
+    });
   }
 
   const supportedEwallets = [
@@ -308,13 +298,10 @@ export default function usePaymentMethod() {
   }
 
   function updateStatusById(id: string, status: string) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/payment-methods/status/${id}`,
-      {
-        method: "PATCH",
-        body: { status },
-      }
-    );
+    return $fetch<Record<string, any>>(`/api/payment-methods/status/${id}`, {
+      method: "PATCH",
+      body: { status },
+    });
   }
 
   return {

package/composables/usePermission.ts

@@ -50,6 +50,7 @@ export default function usePermission() {
   const perm = ref<TPerm>({
     app: "",
     key: "",
+    name: "",
     group: "",
     description: "",
   });
@@ -63,7 +64,7 @@ export default function usePermission() {
 
   function updatePermById(
     id: string,
-    value: Pick<TPerm, "key" | "group" | "description">
+    value: Pick<TPerm, "key" | "name" | "group" | "description">
   ) {
     return $fetch(`/api/permissions/id/${id}`, {
       method: "PATCH",

package/composables/usePrice.ts

@@ -1,6 +1,6 @@
 export default function usePrice() {
   function getByNameType(name: string, type: string) {
-    return useNuxtApp().$api<Record<string, any>>("/api/prices/price", {
+    return $fetch<Record<string, any>>("/api/prices/price", {
       method: "GET",
       params: {
         name,

package/composables/usePromoCode.ts

@@ -1,13 +1,13 @@
 export default function usePromoCode() {
   function add(value: TPromoCode) {
-    return useNuxtApp().$api<Record<string, any>>("/api/promo-codes", {
+    return $fetch<Record<string, any>>("/api/promo-codes", {
       method: "POST",
       body: value,
     });
   }
 
   function getPromoCodes({ search = "", page = 1, status = "active" } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/promo-codes", {
+    return $fetch<Record<string, any>>("/api/promo-codes", {
       method: "GET",
       query: {
         search,
@@ -18,7 +18,7 @@ export default function usePromoCode() {
   }
 
   function getByCode(code: string, type?: string, assigned?: boolean) {
-    return useNuxtApp().$api<TPromoCode>("/api/promo-codes/code", {
+    return $fetch<TPromoCode>("/api/promo-codes/code", {
       method: "GET",
       params: {
         code,
@@ -29,7 +29,7 @@ export default function usePromoCode() {
   }
 
   function getById(id: string) {
-    return useNuxtApp().$api<TPromoCode>(`/api/promo-codes/id/${id}`, {
+    return $fetch<TPromoCode>(`/api/promo-codes/id/${id}`, {
       method: "GET",
     });
   }

package/composables/useRole.ts

@@ -1,89 +1,73 @@
 export default function useRole() {
-  function createRole(
-    { name, permissions, type, org } = {} as {
-      name: string;
-      permissions: Array<string>;
-      type: string;
-      org: string;
-    }
-  ) {
-    return useNuxtApp().$api("/api/roles", {
+  function add(value: Pick<TRole, "name" | "permissions" | "type" | "org">) {
+    return $fetch("/api/roles", {
       method: "POST",
-      body: { name, permissions, type, org },
+      body: value,
     });
   }
 
-  function getRoles({
+  function getAll({
     search = "",
     page = 1,
     limit = 20,
     type = "",
     org = "",
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/roles", {
+    return $fetch<Record<string, any>>("/api/roles", {
       method: "GET",
       query: { search, page, limit, type, org },
     });
   }
 
-  function getRoleById(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(`/api/roles/id/${id}`, {
+  function getById(id: string) {
+    return $fetch<Record<string, any>>(`/api/roles/id/${id}`, {
       method: "GET",
     });
   }
 
-  function updateRoleById(
-    _id: string,
-    name?: string,
-    permissions?: Array<string>
-  ) {
-    return useNuxtApp().$api(`/api/roles/id/${_id}`, {
+  function updateById(id: string, value: Pick<TRole, "name" | "permissions">) {
+    return $fetch(`/api/roles/id/${id}`, {
       method: "PATCH",
-      body: { name, permissions },
+      body: value,
     });
   }
 
   function updatePermissionById(_id: string, permissions?: Array<string>) {
-    return useNuxtApp().$api(`/api/roles/permissions/id/${_id}`, {
+    return $fetch(`/api/roles/permissions/id/${_id}`, {
       method: "PATCH",
       body: { permissions },
     });
   }
 
   function updateRoleFieldById(_id: string, field: string, value: string) {
-    return useNuxtApp().$api(`/api/roles/${_id}`, {
+    return $fetch(`/api/roles/${_id}`, {
       method: "PATCH",
       body: { field, value },
     });
   }
 
-  function deleteRole(_id: string) {
-    return useNuxtApp().$api<Record<string, any>>(`/api/roles/${_id}`, {
+  function deleteById(_id: string) {
+    return $fetch<Record<string, any>>(`/api/roles/${_id}`, {
       method: "DELETE",
     });
   }
 
-  const role = useState("userRole", (): TRole => {
-    return {
-      _id: "",
-      name: "",
-      org: "",
-      permissions: [],
-      createdAt: "",
-      updatedAt: "",
-      deletedAt: "",
-      default: false,
-    };
+  const role = ref<TRole>({
+    name: "",
+    org: "",
+    permissions: [],
+    type: "",
+    description: "",
   });
 
   return {
     role,
-    createRole,
-    getRoles,
-    getRoleById,
-    updateRoleById,
+    add,
+    getAll,
+    getById,
+    updateById,
     updateRoleFieldById,
-    deleteRole,
+    deleteById,
     updatePermissionById,
   };
 }

package/composables/useSubscription.ts

@@ -4,7 +4,7 @@ export default function useSubscription() {
     trialDays: number,
     productId: string
   ) {
-    return useNuxtApp().$api("/api/subscriptions/plan", {
+    return $fetch("/api/subscriptions/plan", {
       method: "POST",
       body: {
         seats,
@@ -15,7 +15,7 @@ export default function useSubscription() {
   }
 
   function add(subscriptionId: string, user: string) {
-    return useNuxtApp().$api("/api/subscriptions", {
+    return $fetch("/api/subscriptions", {
       method: "POST",
       body: {
         subscriptionId,
@@ -25,7 +25,7 @@ export default function useSubscription() {
   }
 
   function addBillingContactById(id: string, email: string) {
-    return useNuxtApp().$api(`/api/subscriptions/billing-contact/${id}`, {
+    return $fetch(`/api/subscriptions/billing-contact/${id}`, {
       method: "PUT",
       body: {
         email,
@@ -38,7 +38,7 @@ export default function useSubscription() {
     addedAt: string,
     email: string
   ) {
-    return useNuxtApp().$api(
+    return $fetch(
       `/api/subscriptions/billing-contact/${id}/added-at/${addedAt}`,
       {
         method: "PUT",
@@ -50,7 +50,7 @@ export default function useSubscription() {
   }
 
   function deleteBillingContactByAddedAt(id: string, addedAt: string) {
-    return useNuxtApp().$api(
+    return $fetch(
       `/api/subscriptions/billing-contact/${id}/added-at/${addedAt}`,
       {
         method: "DELETE",
@@ -59,33 +59,27 @@ export default function useSubscription() {
   }
 
   function getById(id: string) {
-    return useNuxtApp().$api<TSubscription>(`/api/subscriptions/id/${id}`);
+    return $fetch<TSubscription>(`/api/subscriptions/id/${id}`);
   }
 
   function getByAffiliateId(id: string) {
-    return useNuxtApp().$api<TSubscription>(
-      `/api/subscriptions/affiliate/${id}`
-    );
+    return $fetch<TSubscription>(`/api/subscriptions/affiliate/${id}`);
   }
 
   function getByOrgId(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/subscriptions/org/${id}`
-    );
+    return $fetch<Record<string, any>>(`/api/subscriptions/org/${id}`);
   }
 
   function getSubscriptions() {
-    return useNuxtApp().$api("/api/subscriptions");
+    return $fetch("/api/subscriptions");
   }
 
   function getSubscriptionStatusById(id: string) {
-    return useNuxtApp().$api<Record<string, string>>(
-      `/api/subscriptions/status/${id}`
-    );
+    return $fetch<Record<string, string>>(`/api/subscriptions/status/${id}`);
   }
 
   function cancelSubscription(id: string) {
-    return useNuxtApp().$api(`/api/subscriptions/cancel/${id}`, {
+    return $fetch(`/api/subscriptions/cancel/${id}`, {
       method: "DELETE",
     });
   }
@@ -96,7 +90,7 @@ export default function useSubscription() {
   );
 
   function updatePromoCodeById(id: string, promoCode: string) {
-    return useNuxtApp().$api(`/api/subscriptions/promo-code/${id}`, {
+    return $fetch(`/api/subscriptions/promo-code/${id}`, {
       method: "PUT",
       body: {
         promoCode,
@@ -105,7 +99,7 @@ export default function useSubscription() {
   }
 
   function updateStatusById(id: string, status: string) {
-    return useNuxtApp().$api(`/api/subscriptions/status/${id}`, {
+    return $fetch(`/api/subscriptions/status/${id}`, {
       method: "PUT",
       body: {
         status,
@@ -114,7 +108,7 @@ export default function useSubscription() {
   }
 
   function updatePaymentMethodById(id: string, paymentMethodId: string) {
-    return useNuxtApp().$api(`/api/subscriptions/payment-method/${id}`, {
+    return $fetch(`/api/subscriptions/payment-method/${id}`, {
       method: "PUT",
       body: {
         paymentMethodId,
@@ -168,23 +162,17 @@ export default function useSubscription() {
   };
 
   function initOrgSubscription(value: TSub) {
-    return useNuxtApp().$api<Record<string, any>>(
-      "/api/subscriptions/organization",
-      {
-        method: "POST",
-        body: value,
-      }
-    );
+    return $fetch<Record<string, any>>("/api/subscriptions/organization", {
+      method: "POST",
+      body: value,
+    });
   }
 
   function initAffiliateSubscription(value: TSub) {
-    return useNuxtApp().$api<Record<string, any>>(
-      "/api/subscriptions/affiliate",
-      {
-        method: "POST",
-        body: value,
-      }
-    );
+    return $fetch<Record<string, any>>("/api/subscriptions/affiliate", {
+      method: "POST",
+      body: value,
+    });
   }
 
   function updateSeatsById({
@@ -193,7 +181,7 @@ export default function useSubscription() {
     seats = 0,
     amount = 0,
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>(
+    return $fetch<Record<string, any>>(
       `/api/subscriptions/seats/${subscriptionId}`,
       {
         method: "PUT",
@@ -207,7 +195,7 @@ export default function useSubscription() {
   }
 
   function processSubscriptionPayment(id: string, invoice: string) {
-    return useNuxtApp().$api(`/api/subscriptions/payment/id/${id}`, {
+    return $fetch(`/api/subscriptions/payment/id/${id}`, {
       method: "PUT",
       body: {
         invoice,
@@ -230,7 +218,7 @@ export default function useSubscription() {
       type: string;
     };
   }) {
-    return useNuxtApp().$api("/api/subscriptions/subscribe", {
+    return $fetch("/api/subscriptions/subscribe", {
       method: "POST",
       body: value,
     });

package/composables/useUser.ts

@@ -7,49 +7,49 @@ export default function useUser() {
     org = "",
     orgName = "",
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/auth/invite", {
+    return $fetch<Record<string, any>>("/api/auth/invite", {
       method: "POST",
       body: { email, app, role, roleName, org, orgName },
     });
   }
 
   function updateName({ firstName = "", lastName = "" } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/users/name", {
+    return $fetch<Record<string, any>>("/api/users/name", {
       method: "PUT",
       body: { firstName, lastName },
     });
   }
 
   function updateBirthday({ month = "", day = 0, year = 0 } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/users/birthday", {
+    return $fetch<Record<string, any>>("/api/users/birthday", {
       method: "PUT",
       body: { month, day, year },
     });
   }
 
   function updateGender(gender = "") {
-    return useNuxtApp().$api<Record<string, any>>("/api/users/gender", {
+    return $fetch<Record<string, any>>("/api/users/gender", {
       method: "PUT",
       body: { gender },
     });
   }
 
   function updateEmail(email = "") {
-    return useNuxtApp().$api<Record<string, any>>("/api/users/email", {
+    return $fetch<Record<string, any>>("/api/users/email", {
       method: "PUT",
       body: { email },
     });
   }
 
   function updateContact(contact = "") {
-    return useNuxtApp().$api<Record<string, any>>("/api/users/contact", {
+    return $fetch<Record<string, any>>("/api/users/contact", {
       method: "PUT",
       body: { contact },
     });
   }
 
   function updateUserFieldById(id = "", field = "", value = "") {
-    return useNuxtApp().$api<Record<string, any>>(`/api/users/field/${id}`, {
+    return $fetch<Record<string, any>>(`/api/users/field/${id}`, {
       method: "PATCH",
       body: { field, value },
     });
@@ -61,14 +61,14 @@ export default function useUser() {
     search = "",
     page = 1,
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/users", {
+    return $fetch<Record<string, any>>("/api/users", {
       method: "GET",
       query: { status, search, page, type },
     });
   }
 
   function getById(id = "") {
-    return useNuxtApp().$api<Record<string, any>>(`/api/users/id/${id}`, {
+    return $fetch<Record<string, any>>(`/api/users/id/${id}`, {
       method: "GET",
     });
   }
@@ -81,7 +81,7 @@ export default function useUser() {
     referralCode = "",
     type = "",
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>(`/api/users/invite/${id}`, {
+    return $fetch<Record<string, any>>(`/api/users/invite/${id}`, {
       method: "POST",
       body: { firstName, lastName, password, referralCode, type },
     });

package/composables/useUtils.ts

@@ -140,7 +140,7 @@ export default function useUtils() {
 
   async function getCountries() {
     try {
-      const countries = await useNuxtApp().$api<Array<Record<string, any>>>(
+      const countries = await $fetch<Array<Record<string, any>>>(
         "https://restcountries.com/v3.1/all?fields=name,currencies,idd",
         { method: "GET" }
       );

package/composables/useVerification.ts

@@ -7,7 +7,7 @@ export default function useUser() {
     email = "",
     app = "",
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/verifications", {
+    return $fetch<Record<string, any>>("/api/verifications", {
       method: "GET",
       query: { status, search, page, type, email, app },
     });

package/package.json

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

package/plugins/API.ts

@@ -48,7 +48,7 @@ export default defineNuxtPlugin(() => {
     return useFetch(path, options);
   };
 
-  // Expose to useNuxtApp().$api
+  // Expose to $fetch
   return {
     provide: {
       api,

package/plugins/member.client.ts

@@ -1,10 +1,10 @@
 export default defineNuxtPlugin(() => {
   const router = useRouter();
   const { getByUserType } = useMember();
-  const { getRoleById } = useRole();
+  const { getById: getRoleById } = useRole();
   const { membership, permissions } = useLocalAuth();
 
-  router.afterEach((to) => {
+  router.afterEach(async (to) => {
     const isSecured = to.meta?.member;
     if (!isSecured) return;
 
@@ -17,7 +17,7 @@ export default defineNuxtPlugin(() => {
       data: userMemberData,
       error: userMemberError,
       refresh: refreshUserMemberData,
-    } = useLazyAsyncData(
+    } = await useLazyAsyncData(
       "plugin-get-member-by-id" + userId,
       () => getByUserType(userId, APP, org),
       { immediate: false }
@@ -43,7 +43,7 @@ export default defineNuxtPlugin(() => {
 
     const roleId = computed(() => membership.value?.role ?? "");
 
-    const { data: roleData, refresh: refreshRoleData } = useLazyAsyncData(
+    const { data: roleData, refresh: refreshRoleData } = await useLazyAsyncData(
       "plugin-get-role-by-id" + roleId.value,
       () => getRoleById(roleId.value),
       { immediate: false }