@eeplatform/nuxt-layer-common 1.4.10 → 1.5.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/nuxt-layer-common
 
+## 1.5.1
+
+### Patch Changes
+
+- ab3086b: Fix school year generator utils
+
+## 1.5.0
+
+### Minor Changes
+
+- cc493b1: Migrate from custom fetch to $fetch
+
 ## 1.4.10
 
 ### Patch Changes

package/components/EnrollmentForm.vue

@@ -1486,8 +1486,11 @@ const isSeniorHighSchool = computed(() => {
   return ["grade-11", "grade-12"].includes(gradeLevel);
 });
 
-const effectiveSchoolYearOptions = generateSchoolYears();
-const lastSchoolYearOptions = generateSchoolYears(50).reverse();
+const effectiveSchoolYearOptions = computed(() =>
+  generateSchoolYears(0, "future")
+);
+
+const lastSchoolYearOptions = generateSchoolYears(50);
 
 const indigenousCommunitiesPhilippines = [
   // Luzon (Northern Philippines) - Cordillera Groups (Igorot Subgroups)
@@ -1664,7 +1667,6 @@ watchEffect(() => {
 });
 
 import { useMask } from "vuetify";
-import { fa } from "zod/v4/locales";
 
 watchEffect(() => {
   const mask = useMask({ mask: "##/##/####" });

package/components/OfficeMain.vue

@@ -65,7 +65,7 @@
 <script setup lang="ts">
 definePageMeta({
   middleware: ["01-auth", "org"],
-  secured: true,
+  ,
 });
 
 const headers = [

package/composables/useAddress.ts

@@ -13,7 +13,7 @@ export default function useAddress() {
     postalCode = "",
     taxId = "",
   } = {}) {
-    return useNuxtApp().$api("/api/addresses", {
+    return $fetch("/api/addresses", {
       method: "POST",
       body: {
         type,
@@ -57,18 +57,18 @@ export default function useAddress() {
       payload.org = orgId;
     }
 
-    return useNuxtApp().$api(`/api/addresses/details/${id}`, {
+    return $fetch(`/api/addresses/details/${id}`, {
       method: "PUT",
       body: payload,
     });
   }
 
   function getByUserId(user = "") {
-    return useNuxtApp().$api<TAddress>(`/api/addresses/user/${user}`);
+    return $fetch<TAddress>(`/api/addresses/user/${user}`);
   }
 
   function getByOrgId(id = "") {
-    return useNuxtApp().$api<TAddress>(`/api/addresses/org/${id}`);
+    return $fetch<TAddress>(`/api/addresses/org/${id}`);
   }
 
   const _address = useState("address", (): TAddress => {

package/composables/useBasicEdu.ts

@@ -114,12 +114,24 @@ export default function useBasicEdu() {
     },
   ];
 
-  function generateSchoolYears(generation = 0) {
+  function generateSchoolYears(generation = 0, mode = "past") {
     const currentYear = new Date().getFullYear();
     const years = [];
-    for (let i = currentYear - generation; i <= currentYear; i++) {
-      years.push(`${i}-${i + 1}`);
+
+    if (mode === "past") {
+      // Generate from current year going back to past years
+      for (let i = 0; i <= generation; i++) {
+        const year = currentYear - i;
+        years.push(`${year}-${year + 1}`);
+      }
+    } else if (mode === "future") {
+      // Generate from current year going forward to future years
+      for (let i = 0; i <= generation; i++) {
+        const year = currentYear + i;
+        years.push(`${year}-${year + 1}`);
+      }
     }
+
     return years;
   }
 

package/composables/useChartOfAccount.ts

@@ -7,7 +7,7 @@ export default function useChartOfAccount() {
       children?: number;
     }
   ) {
-    return useNuxtApp().$api<Record<string, any>>("/api/chart-of-accounts", {
+    return $fetch<Record<string, any>>("/api/chart-of-accounts", {
       method: "GET",
       query: { page, status, orgId, children },
     });
@@ -23,33 +23,30 @@ export default function useChartOfAccount() {
   };
 
   function add(value: TAddPayload) {
-    return useNuxtApp().$api<TAddPayload>("/api/chart-of-accounts", {
+    return $fetch<TAddPayload>("/api/chart-of-accounts", {
       method: "POST",
       body: value,
     });
   }
 
   function getById(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/chart-of-accounts/id/${id}`
-    );
+    return $fetch<Record<string, any>>(`/api/chart-of-accounts/id/${id}`);
   }
 
   function updateById(
     id: string,
     value: Pick<TAddPayload, "name" | "code" | "normalBalance" | "parent">
   ) {
-    return useNuxtApp().$api<TAddPayload>(`/api/chart-of-accounts/id/${id}`, {
+    return $fetch<TAddPayload>(`/api/chart-of-accounts/id/${id}`, {
       method: "PUT",
       body: value,
     });
   }
 
   function deleteById(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/chart-of-accounts/id/${id}`,
-      { method: "DELETE" }
-    );
+    return $fetch<Record<string, any>>(`/api/chart-of-accounts/id/${id}`, {
+      method: "DELETE",
+    });
   }
 
   return {

package/composables/useFile.ts

@@ -7,19 +7,16 @@ export default function useFile() {
     const formData = new FormData();
     formData.append("file", file);
 
-    return useNuxtApp().$api<Record<string, any>>("/api/files", {
+    return $fetch<Record<string, any>>("/api/files", {
       method: "POST",
       body: formData,
     });
   }
 
   function deleteFile(attachmentId: string) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/files/${attachmentId}`,
-      {
-        method: "DELETE",
-      }
-    );
+    return $fetch<Record<string, any>>(`/api/files/${attachmentId}`, {
+      method: "DELETE",
+    });
   }
 
   return {

package/composables/useInvoice.ts

@@ -4,29 +4,23 @@ export default function useInvoice() {
       throw new Error("Subscription ID is required");
     }
 
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/invoices/subscription/${id}`,
-      {
-        method: "GET",
-        params: {
-          search,
-          page,
-        },
-      }
-    );
+    return $fetch<Record<string, any>>(`/api/invoices/subscription/${id}`, {
+      method: "GET",
+      params: {
+        search,
+        page,
+      },
+    });
   }
 
   function getByNumber(number: string) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/invoices/number/${number}`,
-      {
-        method: "GET",
-      }
-    );
+    return $fetch<Record<string, any>>(`/api/invoices/number/${number}`, {
+      method: "GET",
+    });
   }
 
   function getByDueDateStatus(date: string, status: string) {
-    return useNuxtApp().$api<Record<string, any>>(
+    return $fetch<Record<string, any>>(
       `/api/invoices/due-date/${date}/status/${status}`,
       {
         method: "GET",

package/composables/useLocalAuth.ts

@@ -12,7 +12,7 @@ export default function useLocalAuth() {
 
     const { data: getCurrentUserReq, error: getCurrentUserErr } =
       useLazyAsyncData("get-current-user", () =>
-        useNuxtApp().$api<TUser>(`/api/users/id/${user}`)
+        $fetch<TUser>(`/api/users/id/${user}`)
       );
 
     watchEffect(() => {
@@ -30,7 +30,7 @@ export default function useLocalAuth() {
   }
 
   async function login({ email = "", password = "", role = "" }) {
-    return useNuxtApp().$api<Record<string, any>>("/api/auth/login", {
+    return $fetch<Record<string, any>>("/api/auth/login", {
       method: "POST",
       body: JSON.stringify({ email, password, role }),
     });
@@ -61,7 +61,7 @@ export default function useLocalAuth() {
   }
 
   async function logout() {
-    return useNuxtApp().$api("/api/auth/logout", {
+    return $fetch("/api/auth/logout", {
       method: "DELETE",
     });
   }
@@ -69,7 +69,7 @@ export default function useLocalAuth() {
   async function getCurrentUser() {
     const user = useCookie("user", cookieConfig).value;
     const { data: userData } = await useLazyAsyncData("get-current-user", () =>
-      useNuxtApp().$api<TUser>(`/api/users/id/${user}`)
+      $fetch<TUser>(`/api/users/id/${user}`)
     );
 
     watchEffect(() => {
@@ -85,7 +85,7 @@ export default function useLocalAuth() {
     }
 
     try {
-      const response = await useNuxtApp().$api("/api/auth/forget-password", {
+      const response = await $fetch("/api/auth/forget-password", {
         method: "POST",
         body: JSON.stringify({ email }),
         headers: { "Content-Type": "application/json" },
@@ -103,7 +103,7 @@ export default function useLocalAuth() {
     passwordConfirmation: string
   ) {
     try {
-      return await useNuxtApp().$api("/api/auth/reset-password", {
+      return await $fetch("/api/auth/reset-password", {
         method: "POST",
         body: JSON.stringify({ otp, newPassword, passwordConfirmation }),
         headers: { "Content-Type": "application/json" },
@@ -115,13 +115,13 @@ export default function useLocalAuth() {
   }
 
   function verify(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(`/api/auth/verify/${id}`, {
+    return $fetch<Record<string, any>>(`/api/auth/verify/${id}`, {
       method: "GET",
     });
   }
 
   function signUp(email: string, referral: string) {
-    return useNuxtApp().$api<Record<string, any>>("/api/auth/sign-up", {
+    return $fetch<Record<string, any>>("/api/auth/sign-up", {
       method: "POST",
       body: { email, referral },
     });

package/composables/useMember.ts

@@ -22,11 +22,11 @@ export default function useMember() {
   }));
 
   function getByUserId(user: string) {
-    return useNuxtApp().$api<TMember>(`/api/members/user/${user}`);
+    return $fetch<TMember>(`/api/members/user/${user}`);
   }
 
   function getByUserType(user: string, type: string, org?: string) {
-    return useNuxtApp().$api<TMember>(`/api/members/user/${user}/app/${type}`, {
+    return $fetch<TMember>(`/api/members/user/${user}/app/${type}`, {
       method: "GET",
       query: { org },
     });
@@ -41,7 +41,7 @@ export default function useMember() {
     type = "",
     status = "active",
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/members", {
+    return $fetch<Record<string, any>>("/api/members", {
       method: "GET",
       query: { page, limit, search, user, org, type, status },
     });
@@ -50,25 +50,19 @@ export default function useMember() {
     verificationId: string,
     payload: Record<string, any>
   ) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/users/invite/${verificationId}`,
-      {
-        method: "POST",
-        body: payload,
-      }
-    );
+    return $fetch<Record<string, any>>(`/api/users/invite/${verificationId}`, {
+      method: "POST",
+      body: payload,
+    });
   }
 
   function createMemberInvite(verificatonId: string) {
-    return useNuxtApp().$api<TMember>(
-      `/api/members/verification/${verificatonId}`,
-      {
-        method: "POST",
-      }
-    );
+    return $fetch<TMember>(`/api/members/verification/${verificatonId}`, {
+      method: "POST",
+    });
   }
   function updateMemberStatus(id: string, status: string) {
-    return useNuxtApp().$api<Record<string, any>>(
+    return $fetch<Record<string, any>>(
       `/api/members/status/${status}/id/${id}`,
       {
         method: "PUT",
@@ -82,7 +76,7 @@ export default function useMember() {
     type: string,
     org: string
   ) {
-    return useNuxtApp().$api<Record<string, any>>(
+    return $fetch<Record<string, any>>(
       `/api/members/id/${id}/role/${role}/type/${type}/org/${org}`,
       {
         method: "PUT",

package/composables/useOffice.ts

@@ -1,6 +1,6 @@
 export default function useOffice() {
   function add(value: TOffice) {
-    return useNuxtApp().$api<Record<string, any>>("/api/offices", {
+    return $fetch<Record<string, any>>("/api/offices", {
       method: "POST",
       body: value,
     });
@@ -13,20 +13,20 @@ export default function useOffice() {
     type = "",
     status = "active",
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/offices", {
+    return $fetch<Record<string, any>>("/api/offices", {
       method: "GET",
       query: { page, limit, search, type, status },
     });
   }
 
   function updateById(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(`/api/offices/${id}`, {
+    return $fetch<Record<string, any>>(`/api/offices/${id}`, {
       method: "PUT",
     });
   }
 
   function deleteById(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(`/api/offices/${id}`, {
+    return $fetch<Record<string, any>>(`/api/offices/${id}`, {
       method: "DELETE",
     });
   }

package/composables/useOrder.ts

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

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/usePlantilla.ts

@@ -1,6 +1,6 @@
 export default function usePlantilla() {
   function addPlantilla(plantilla: TPlantilla) {
-    return useNuxtApp().$api<{ message: string }>("/api/plantillas", {
+    return $fetch<{ message: string }>("/api/plantillas", {
       method: "POST",
       body: plantilla,
     });
@@ -13,7 +13,7 @@ export default function usePlantilla() {
     org = "",
     app = "admin",
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/plantillas", {
+    return $fetch<Record<string, any>>("/api/plantillas", {
       method: "GET",
       query: { page, status, search, org, app },
     });
@@ -29,7 +29,7 @@ export default function usePlantilla() {
     formData.append("region", region);
     formData.append("division", division);
 
-    return useNuxtApp().$api<{
+    return $fetch<{
       message: string;
       details: {
         successful: number;

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,15 +1,14 @@
 export default function useRole() {
   function createRole(
-    { name, permissions, type, id } = {} as {
+    { name, permissions, type } = {} as {
       name: string;
       permissions: Array<string>;
       type: string;
-      id: string;
     }
   ) {
-    return useNuxtApp().$api("/api/roles", {
+    return $fetch("/api/roles", {
       method: "POST",
-      body: { name, permissions, type, id },
+      body: { name, permissions, type },
     });
   }
 
@@ -20,14 +19,14 @@ export default function useRole() {
     type = "",
     id = "",
   } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/roles", {
+    return $fetch<Record<string, any>>("/api/roles", {
       method: "GET",
       query: { search, page, limit, type, id },
     });
   }
 
   function getRoleById(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(`/api/roles/id/${id}`, {
+    return $fetch<TRole>(`/api/roles/id/${id}`, {
       method: "GET",
     });
   }
@@ -37,28 +36,28 @@ export default function useRole() {
     name?: string,
     permissions?: Array<string>
   ) {
-    return useNuxtApp().$api(`/api/roles/id/${_id}`, {
+    return $fetch(`/api/roles/id/${_id}`, {
       method: "PATCH",
       body: { name, permissions },
     });
   }
 
   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}`, {
+    return $fetch<Record<string, any>>(`/api/roles/${_id}`, {
       method: "DELETE",
     });
   }

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

@@ -132,7 +132,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/middleware/01.auth.ts

@@ -1,4 +1,4 @@
-export default defineNuxtRouteMiddleware(async () => {
+export default defineNuxtRouteMiddleware(() => {
   // Ensure middleware runs only on the client side
   if (import.meta.server) return;
 

package/middleware/02.member.ts

@@ -0,0 +1,18 @@
+export default defineNuxtRouteMiddleware(async () => {
+  // Ensure middleware runs only on the client side
+  if (import.meta.server) return;
+
+  const { cookieConfig } = useRuntimeConfig().public;
+
+  const user = useCookie("user", cookieConfig).value ?? "";
+
+  const { getByUserId } = useMember();
+  try {
+    const memberData = await getByUserId(user);
+    if (memberData.role) {
+      useCookie("role", cookieConfig).value = memberData.role;
+    }
+  } catch (error) {
+    navigateTo({ name: "require-membership" });
+  }
+});

package/middleware/03.role.ts

@@ -0,0 +1,22 @@
+export default defineNuxtRouteMiddleware(async () => {
+  // Ensure middleware runs only on the client side
+  if (import.meta.server) return;
+
+  const { cookieConfig } = useRuntimeConfig().public;
+
+  const { getRoleById } = useRole();
+  const role = useCookie("role", cookieConfig).value ?? "";
+  if (!role) {
+    navigateTo({ name: "require-role" });
+    return;
+  }
+
+  const { userAppRole } = useLocalSetup();
+
+  try {
+    const roleData = await getRoleById(role);
+    userAppRole.value = roleData;
+  } catch (error) {
+    navigateTo({ name: "require-role" });
+  }
+});

package/package.json

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

package/pages/require-role.vue

@@ -0,0 +1,29 @@
+<template>
+  <v-row no-gutters class="fill-height" align="center" justify="center">
+    <v-col cols="12" lg="6" md="6" sm="6" class="text-center text-subtitle-1">
+      Role is required to access this app. Please contact administrator.
+      <v-row no-gutters justify="center" align="center" class="mt-2">
+        <v-btn
+          @click="goToAccount"
+          rounded="xl"
+          variant="tonal"
+          class="text-none text-subtitle-2"
+        >
+          Go to Account Page
+        </v-btn>
+      </v-row>
+    </v-col>
+  </v-row>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "plain",
+});
+
+const { APP_ACCOUNT } = useRuntimeConfig().public;
+
+function goToAccount() {
+  window.location.href = `${APP_ACCOUNT}/home`;
+}
+</script>

package/plugins/API.ts

@@ -1,33 +0,0 @@
-export default defineNuxtPlugin(() => {
-  const { cookieConfig } = useRuntimeConfig().public;
-  const { redirect } = useLocal();
-
-  const api = $fetch.create({
-    baseURL: "/",
-    retry: 1,
-    retryStatusCodes: [401],
-    retryDelay: 500,
-    onRequest({ options }) {
-      const sid = useCookie("sid", cookieConfig).value ?? "";
-      options.headers.set("authorization", sid);
-    },
-    onResponse({ response }) {
-      if (response.status === 401) {
-        // Clear cookie
-        let sid = useCookie("sid", cookieConfig).value;
-        if (sid) {
-          sid = null;
-          const { APP_MAIN } = useRuntimeConfig().public;
-          redirect(APP_MAIN, "logout");
-        }
-      }
-    },
-  });
-
-  // Expose to useNuxtApp().$api
-  return {
-    provide: {
-      api,
-    },
-  };
-});