@goweekdays/layer-common 1.3.5 → 1.4.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @goweekdays/layer-common
 
+## 1.4.2
+
+### Patch Changes
+
+- 273fab2: Enhance member fetching and UI improvements
+
+## 1.4.1
+
+### Patch Changes
+
+- b7afd94: Improve organization requirement page UX and messaging
+
+## 1.4.0
+
+### Minor Changes
+
+- 6a01b5d: Add plan management and refactor subscription logic
+
 ## 1.3.5
 
 ### Patch Changes

package/components/InputLabel.vue

@@ -1,6 +1,9 @@
 <template>
   <span class="text-subtitle-2 font-weight-bold">
-    {{ title }} <span v-if="props.required" class="text-error">*</span>
+    <span :class="props.class">
+      {{ title }}
+    </span>
+    <span v-if="props.required" class="text-error">*</span>
   </span>
 </template>
 
@@ -14,5 +17,9 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  class: {
+    type: String,
+    default: "",
+  },
 });
 </script>

package/components/Layout/NavigationDrawer.vue

@@ -26,6 +26,9 @@
     <template #append>
       <slot name="append"></slot>
     </template>
+    <template #prepend>
+      <slot name="prepend"></slot>
+    </template>
   </v-navigation-drawer>
 </template>
 

package/components/SwitchContext.vue

@@ -25,7 +25,7 @@
 
     <v-card width="300px" rounded="lg" class="pa-4">
       <span class="text-subtitle-2 font-weight-bold">
-        Switch {{ prop.title }} context
+        {{ prop.title }}
       </span>
       <v-text-field
         v-model="search"
@@ -66,7 +66,7 @@ const prop = defineProps({
   title: {
     type: String,
     required: true,
-    default: "app",
+    default: "Switch Context",
   },
   items: {
     type: Array as PropType<Array<Record<string, any>>>,

package/composables/useLocal.ts

@@ -10,7 +10,6 @@ export default function useLocal() {
   const drawer = useState("drawer", () => true);
 
   const { APP_INVENTORY, APP_ASSET, APP_FINANCE } = appConfig;
-  const { currentOrg } = useOrg();
 
   const apps = computed(() => {
     return [
@@ -18,19 +17,19 @@ export default function useLocal() {
         title: "Finance",
         icon: "mdi-file-document-multiple",
         link: APP_FINANCE as string,
-        landingPage: `org/${currentOrg.value ?? ""}`,
+        landingPage: "",
       },
       {
         title: "Inventory",
         icon: "mdi-warehouse",
         link: APP_INVENTORY as string,
-        landingPage: `org/${currentOrg.value ?? ""}`,
+        landingPage: "",
       },
       {
         title: "Asset",
         icon: "mdi-package-variant-closed",
         link: APP_ASSET as string,
-        landingPage: `org/${currentOrg.value ?? ""}`,
+        landingPage: "",
       },
     ];
   });

package/composables/useLocalAuth.ts

@@ -48,7 +48,7 @@ export default function useLocalAuth() {
   }
 
   function verify(id: string) {
-    return $fetch<TKeyValuePair>(`/api/auth/verify/${id}`, {
+    return $fetch<Record<string, any>>(`/api/auth/verify/${id}`, {
       method: "GET",
     });
   }

package/composables/useMember.ts

@@ -33,6 +33,22 @@ export default function useMember() {
     });
   }
 
+  function getAllByAppUser({
+    app = "",
+    user = "",
+    limit = 10,
+    page = 1,
+    search = "",
+  } = {}) {
+    return $fetch<Record<string, any>>(
+      `/api/members/orgs/app/${app}/user/${user}`,
+      {
+        method: "GET",
+        query: { page, limit, search },
+      }
+    );
+  }
+
   async function getAll({
     page = 1,
     search = "",
@@ -104,5 +120,6 @@ export default function useMember() {
     updateRoleById,
     updateStatusById,
     deleteById,
+    getAllByAppUser,
   };
 }

package/composables/useOrg.ts

@@ -1,5 +1,9 @@
 export default function useOrg() {
-  function add(value: Pick<TOrg, "name" | "email" | "contact" | "createdBy">) {
+  function add(
+    value: Pick<TOrg, "name" | "email" | "contact" | "createdBy"> & {
+      seats: number;
+    }
+  ) {
     return $fetch<Record<string, any>>("/api/organizations", {
       method: "POST",
       body: value,
@@ -35,6 +39,16 @@ export default function useOrg() {
     });
   }
 
+  function updateById(
+    id: string,
+    options: Pick<TOrg, "name" | "description" | "email" | "contact">
+  ) {
+    return $fetch(`/api/organizations/id/${id}`, {
+      method: "PATCH",
+      body: options,
+    });
+  }
+
   const org = ref<TOrg>({
     name: "",
     contact: "",
@@ -48,5 +62,6 @@ export default function useOrg() {
     getAll,
     getByUserId,
     getById,
+    updateById,
   };
 }

package/composables/usePlan.ts

@@ -0,0 +1,19 @@
+export function usePlan() {
+  const plan = ref<TPlan>({
+    name: "",
+    price: 0,
+    currency: "",
+    billingCycle: "monthly",
+  });
+
+  function getDefaultPlan() {
+    return $fetch<Record<string, any>>(`/api/plans/default`, {
+      method: "GET",
+    });
+  }
+
+  return {
+    plan,
+    getDefaultPlan,
+  };
+}

package/composables/useSubscription.ts

@@ -1,252 +1,51 @@
 export default function useSubscription() {
-  function createSubscriptionPlan(
-    seats: number,
-    trialDays: number,
-    productId: string
-  ) {
-    return $fetch("/api/subscriptions/plan", {
-      method: "POST",
-      body: {
-        seats,
-        trialDays,
-        productId,
-      },
-    });
-  }
+  const subscription = ref<TSubscription>({
+    org: "",
+    seats: 0,
+    paidSeats: 0,
+    amount: 0,
+    currency: "",
+    billingCycle: "monthly",
+    nextBillingDate: "",
+  });
 
-  function add(subscriptionId: string, user: string) {
-    return $fetch("/api/subscriptions", {
-      method: "POST",
-      body: {
-        subscriptionId,
-        user,
-      },
+  function getByOrg(org = "") {
+    return $fetch<Record<string, any>>(`/api/subscriptions/org/${org}`, {
+      method: "GET",
     });
   }
 
-  function addBillingContactById(id: string, email: string) {
-    return $fetch(`/api/subscriptions/billing-contact/${id}`, {
-      method: "PUT",
-      body: {
-        email,
-      },
-    });
-  }
-
-  function updateBillingContactByAddedAt(
-    id: string,
-    addedAt: string,
-    email: string
+  function getTransactionsById(
+    id = "",
+    options: { page?: number; limit?: number } = {}
   ) {
-    return $fetch(
-      `/api/subscriptions/billing-contact/${id}/added-at/${addedAt}`,
-      {
-        method: "PUT",
-        body: {
-          email,
-        },
-      }
-    );
-  }
-
-  function deleteBillingContactByAddedAt(id: string, addedAt: string) {
-    return $fetch(
-      `/api/subscriptions/billing-contact/${id}/added-at/${addedAt}`,
-      {
-        method: "DELETE",
-      }
-    );
-  }
-
-  function getById(id: string) {
-    return $fetch<TSubscription>(`/api/subscriptions/id/${id}`);
-  }
-
-  function getByAffiliateId(id: string) {
-    return $fetch<TSubscription>(`/api/subscriptions/affiliate/${id}`);
-  }
-
-  function getByOrgId(id: string) {
-    return $fetch<Record<string, any>>(`/api/subscriptions/org/${id}`);
-  }
-
-  function getSubscriptions() {
-    return $fetch("/api/subscriptions");
-  }
-
-  function getSubscriptionStatusById(id: string) {
-    return $fetch<Record<string, string>>(`/api/subscriptions/status/${id}`);
-  }
-
-  function cancelSubscription(id: string) {
-    return $fetch(`/api/subscriptions/cancel/${id}`, {
-      method: "DELETE",
-    });
-  }
-
-  const affiliateSubscription = useState(
-    "affiliateSubscription",
-    () => "inactive"
-  );
-
-  function updatePromoCodeById(id: string, promoCode: string) {
-    return $fetch(`/api/subscriptions/promo-code/${id}`, {
-      method: "PUT",
-      body: {
-        promoCode,
-      },
-    });
-  }
-
-  function updateStatusById(id: string, status: string) {
-    return $fetch(`/api/subscriptions/status/${id}`, {
-      method: "PUT",
-      body: {
-        status,
-      },
-    });
-  }
-
-  function updatePaymentMethodById(id: string, paymentMethodId: string) {
-    return $fetch(`/api/subscriptions/payment-method/${id}`, {
-      method: "PUT",
-      body: {
-        paymentMethodId,
-      },
-    });
-  }
-
-  async function affSubscriptionStatus() {
-    const { currentUser } = useLocalAuth();
-
-    if (currentUser.value && currentUser.value._id) {
-      try {
-        const result = await getByAffiliateId(currentUser.value._id);
-        affiliateSubscription.value = result.status as string;
-      } catch (error) {
-        console.error("failed to get the subscription", error);
-      }
-    }
-  }
-
-  const orgSubscription = useState("orgSubscription", () => "inactive");
-
-  async function orgSubscriptionStatus() {
-    const { currentOrg } = useOrg();
-
-    if (currentOrg.value) {
-      try {
-        const data = await getByOrgId(currentOrg.value);
-        orgSubscription.value = data?.status as string;
-      } catch (error) {
-        console.error("failed to get the subscription", error);
-      }
-    }
-  }
-
-  type TSub = {
-    customer_id: string;
-    amount: number;
-    payment_method_id: string;
-    payment_method_type: string;
-    payment_method_channel: string;
-    payment_method_expiry_month?: string;
-    payment_method_expiry_year?: string;
-    payment_method_cvv?: string;
-    payment_method_cardholder_name?: string;
-    currency?: string;
-    seats?: number;
-    organization?: TOrg;
-    billingAddress: TAddress;
-    promoCode?: string;
-  };
-
-  function initOrgSubscription(value: TSub) {
-    return $fetch<Record<string, any>>("/api/subscriptions/organization", {
-      method: "POST",
-      body: value,
-    });
-  }
-
-  function initAffiliateSubscription(value: TSub) {
-    return $fetch<Record<string, any>>("/api/subscriptions/affiliate", {
-      method: "POST",
-      body: value,
-    });
-  }
-
-  function updateSeatsById({
-    transactionId = "",
-    subscriptionId = "",
-    seats = 0,
-    amount = 0,
-  } = {}) {
     return $fetch<Record<string, any>>(
-      `/api/subscriptions/seats/${subscriptionId}`,
+      `/api/subscriptions/id/${id}/transactions`,
       {
-        method: "PUT",
-        body: {
-          seats,
-          amount,
-          transactionId,
+        method: "GET",
+        query: {
+          page: options.page ?? 1,
+          limit: options.limit ?? 20,
         },
       }
     );
   }
 
-  function processSubscriptionPayment(id: string, invoice: string) {
-    return $fetch(`/api/subscriptions/payment/id/${id}`, {
-      method: "PUT",
+  function updateSeatById({ id = "", seats = 0, amount = 0, user = "" } = {}) {
+    return $fetch<Record<string, any>>(`/api/subscriptions/id/${id}/seats`, {
+      method: "PATCH",
       body: {
-        invoice,
+        seats,
+        amount,
+        user,
       },
     });
   }
 
-  function addOrgSubscription(value: {
-    user: string;
-    transactionId?: string;
-    promoCode?: string;
-    seats: number;
-    perSeatPrice: number;
-    currency: string;
-    org: {
-      name: string;
-      email: string;
-      contact: string;
-      busInst: string;
-      type: string;
-    };
-  }) {
-    return $fetch("/api/subscriptions/subscribe", {
-      method: "POST",
-      body: value,
-    });
-  }
-
   return {
-    add,
-    getById,
-    getByOrgId,
-    getSubscriptions,
-    affSubscriptionStatus,
-    affiliateSubscription,
-    orgSubscriptionStatus,
-    orgSubscription,
-    getSubscriptionStatusById,
-    cancelSubscription,
-    initAffiliateSubscription,
-    initOrgSubscription,
-    getByAffiliateId,
-    updateSeatsById,
-    updatePromoCodeById,
-    updateStatusById,
-    updatePaymentMethodById,
-    addBillingContactById,
-    updateBillingContactByAddedAt,
-    deleteBillingContactByAddedAt,
-    processSubscriptionPayment,
-    createSubscriptionPlan,
-    addOrgSubscription,
+    subscription,
+    getByOrg,
+    getTransactionsById,
+    updateSeatById,
   };
 }

package/middleware/org.ts

@@ -8,6 +8,6 @@ export default defineNuxtRouteMiddleware((to) => {
   const org = (to.params.org as string) ?? "";
 
   if (org && !hexSchema.safeParse(org).success) {
-    return navigateTo({ name: "require-organization" }, { replace: true });
+    return navigateTo({ name: "require-organization" });
   }
 });

package/nuxt.config.ts

@@ -55,6 +55,12 @@ export default defineNuxtConfig({
     "/api/organizations/**": {
       proxy: `${process.env.API_CORE}/api/organizations/**`,
     },
+    "/api/subscriptions/**": {
+      proxy: `${process.env.API_CORE}/api/subscriptions/**`,
+    },
+    "/api/plans/**": {
+      proxy: `${process.env.API_CORE}/api/plans/**`,
+    },
     "/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.3.5",
+  "version": "1.4.2",
   "main": "./nuxt.config.ts",
   "publishConfig": {
     "access": "public"

package/pages/login.vue

@@ -157,7 +157,13 @@ async function submit({ email = "", password = "" } = {}) {
     } else {
       message.value = "An unexpected error occurred. Please try again.";
     }
-    console.log(error);
+
+    if (
+      error.response.status === 404 &&
+      error.response.url.includes("/api/members/app")
+    ) {
+      navigateTo({ name: "index" });
+    }
   } finally {
     loading.value = false;
   }

package/pages/require-organization.vue

@@ -7,21 +7,45 @@
     </v-col>
 
     <span class="text-subtitle-2">
-      You must have an organization to access this page.
+      You must be part of an organization to access this app. Please contact
+      your organization administrator or create a new organization.
     </span>
 
     <v-col cols="12" class="mt-6">
       <v-row no-gutters justify="center">
-        <v-btn
-          size="large"
-          class="text-none"
-          variant="flat"
-          color="black"
-          rounded
-          @click="createOrg()"
-        >
-          Create Organization
-        </v-btn>
+        <v-col cols="2">
+          <v-btn
+            block
+            size="large"
+            class="text-none"
+            variant="flat"
+            color="black"
+            rounded
+            @click="createOrg()"
+          >
+            Create Organization
+          </v-btn>
+        </v-col>
+      </v-row>
+    </v-col>
+
+    <v-col cols="12" class="text-center font-weight-bold my-2"> or </v-col>
+
+    <v-col cols="12">
+      <v-row no-gutters justify="center">
+        <v-col cols="2">
+          <v-btn
+            block
+            size="large"
+            class="text-none"
+            variant="flat"
+            color="black"
+            rounded
+            :to="{ name: 'index' }"
+          >
+            Return to landing page
+          </v-btn>
+        </v-col>
       </v-row>
     </v-col>
   </v-row>
@@ -34,7 +58,7 @@ definePageMeta({
 
 function createOrg() {
   const { APP, APP_ORG } = useRuntimeConfig().public;
-  if (APP === "organization") {
+  if (APP === "org") {
     navigateTo({ name: "organizations-create" });
   } else {
     navigateTo(`${APP_ORG}/organizations/create`, { external: true });

package/pages/sign-up/[id].vue

@@ -139,7 +139,9 @@ const loading = ref(false);
 
 async function validate() {
   try {
-    await verify(id);
+    const result = await verify(id);
+
+    type.value = result.type;
 
     validInvitation.value = true;
     message.value = "";

package/types/plan.d.ts

@@ -0,0 +1,13 @@
+declare type TPlan = {
+  _id?: string;
+  name: string;
+  description?: string;
+  features?: string[];
+  price: number;
+  currency: string;
+  billingCycle: "monthly" | "yearly";
+  default?: boolean;
+  status?: "active" | "inactive";
+  createdAt?: string;
+  updatedAt?: string;
+};

package/types/subscription.d.ts

@@ -1,29 +1,27 @@
-declare type TBillingRecipient = {
-  addedAt?: string;
-  email: string;
-};
-
 declare type TSubscription = {
   _id?: string;
-  user?: string;
-  org?: string;
-  customerId: string;
-  paymentMethodId: string;
+  org: string;
+  seats: number;
+  paidSeats: number;
   amount: number;
-  description?: string;
   currency: string;
+  billingCycle: "monthly" | "yearly"; // e.g., 'monthly', 'yearly'
   promoCode?: string;
-  type: string;
-  paidSeats?: number;
-  currentSeats?: number;
-  maxSeats?: number;
   status?: string;
-  billingCycle: "monthly" | "yearly";
-  billingContacts?: TBillingRecipient[];
-  nextBillingDate?: string;
-  lastPaymentStatus?: string;
-  failedAttempts?: number;
+  nextBillingDate: string;
+  createdAt?: string;
+  updatedAt?: string;
+};
+
+declare type TSubscriptionTransaction = {
+  _id?: string;
+  subscription: string;
+  amount: number;
+  currency: string;
+  type: "initiate" | "add-seat" | "remove-seat" | "renewal";
+  description?: string;
+  createdBy: string;
+  createdByName?: string;
   createdAt?: string;
   updatedAt?: string;
-  deletedAt?: string;
 };