@goweekdays/layer-common 1.0.1 → 1.0.3

package/composables/useMember.ts

@@ -1,86 +1,107 @@
 export default function useMember() {
-  const member = useState("member", (): TMember => {
-    return {
-      _id: "",
-      name: "",
-      user: "",
-      role: "",
-      status: "",
-      createdAt: "",
-      updatedAt: "",
-      deletedAt: "",
-    };
-  });
+  const members = useState<Array<TMember>>("members", () => []);
+  const page = useState("page", () => 1);
+  const pages = useState("pages", () => 0);
+  const pageRange = useState("pageRange", () => "-- - -- of --");
 
-  function setMember(value?: Partial<TMember>) {
-    member.value._id = value?._id ?? "";
-    member.value.user = value?.user ?? "";
-    member.value.role = value?.role ?? "";
-    member.value.status = value?.status ?? "";
-    member.value.createdAt = value?.createdAt ?? "";
-    member.value.updatedAt = value?.updatedAt ?? "";
-    member.value.deletedAt = value?.deletedAt ?? "";
-  }
+  const member = useState<TMember>("member", () => ({
+    _id: "",
+    org: "",
+    orgName: "",
+    roleName: "",
+    name: "",
+    user: "",
+    role: "",
+    type: "",
+    customerOrgId: "",
+    customerSiteId: "",
+    status: "",
+    createdAt: "",
+    updatedAt: "",
+    deletedAt: "",
+  }));
 
-  function inviteMember(value: Partial<TMember>) {
-    delete value.createdAt;
-    delete value.updatedAt;
-    delete value._id;
-    delete value.status;
+  function getByUserId(user: string) {
+    return useNuxtApp().$api<TMember>(`/api/members/user/${user}`);
+  }
 
-    return useNuxtApp().$api("/api/members", {
-      method: "POST",
-      body: JSON.stringify(value),
+  function getByUserType(user: string, type: string, org?: string) {
+    return useNuxtApp().$api<TMember>(`/api/members/user/${user}/app/${type}`, {
+      method: "GET",
+      query: { org },
     });
   }
 
-  function getAll({
-    search = "",
+  async function getAll({
     page = 1,
-    org = "",
-    user = "",
-    type = "main",
+    search = "",
     limit = 10,
+    user = "",
+    org = "",
+    type = "",
     status = "active",
   } = {}) {
-    return useNuxtApp().$api<TKeyValuePair>("/api/members", {
+    return useNuxtApp().$api<Record<string, any>>("/api/members", {
       method: "GET",
-      query: { search, page, org, user, type, limit, status },
+      query: { page, limit, search, user, org, type, status },
     });
   }
-
-  const page = useState("memberPage", () => 1);
-  const pages = useState("memberPages", () => 0);
-  const pageRange = useState("memberPageRange", () => "0-0 of 0");
-
-  function getMemberById(id = "") {
-    return useNuxtApp().$api<TMember>(`/api/members/id/${id}`, {
-      method: "GET",
-    });
+  function createUserByVerification(
+    verificationId: string,
+    payload: Record<string, any>
+  ) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/users/invite/${verificationId}`,
+      {
+        method: "POST",
+        body: payload,
+      }
+    );
   }
 
-  function getByUserId(id = "") {
-    return useNuxtApp().$api<TMember>(`/api/members/user/${id}`, {
-      method: "GET",
-    });
+  function createMemberInvite(verificatonId: string) {
+    return useNuxtApp().$api<TMember>(
+      `/api/members/verification/${verificatonId}`,
+      {
+        method: "POST",
+      }
+    );
   }
-
-  function getOrgMember(id = "") {
-    return useNuxtApp().$api<TKeyValuePair>(`/api/members/org/${id}/main`, {
-      method: "GET",
-    });
+  function updateMemberStatus(id: string, status: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/members/status/${status}/id/${id}`,
+      {
+        method: "PUT",
+      }
+    );
   }
 
+  function updateMemberRole(
+    id: string,
+    role: string,
+    type: string,
+    org: string
+  ) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/members/id/${id}/role/${role}/type/${type}/org/${org}`,
+      {
+        method: "PUT",
+      }
+    );
+  }
   return {
+    members,
     member,
-    setMember,
-    inviteMember,
-    getAll,
     page,
     pages,
     pageRange,
-    getMemberById,
-    getOrgMember,
+
+    getAll,
     getByUserId,
+    createUserByVerification,
+    createMemberInvite,
+    getByUserType,
+    updateMemberStatus,
+    updateMemberRole,
   };
 }

package/composables/useOrg.ts

@@ -1,15 +1,25 @@
 export default function useOrg() {
-  function getAll({ page = 1, search = "", limit = 20 } = {}) {
+  function getAll({ page = 1, search = "", limit = 20, status = "" } = {}) {
     return useNuxtApp().$api<Record<string, any>>("/api/organizations", {
       method: "GET",
       query: {
         page,
         search,
         limit,
+        status,
       },
     });
   }
 
+  function getById(id = "") {
+    return useNuxtApp().$api<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}`,
@@ -91,5 +101,6 @@ export default function useOrg() {
     total,
     getByName,
     currentOrg,
+    getById,
   };
 }

package/composables/useUser.ts

@@ -1,8 +1,15 @@
 export default function useUser() {
-  function inviteUser({ email = "", app = "", role = "", name = "" } = {}) {
+  function inviteUser({
+    email = "",
+    app = "",
+    role = "",
+    roleName = "",
+    org = "",
+    orgName = "",
+  } = {}) {
     return useNuxtApp().$api<Record<string, any>>("/api/auth/invite", {
       method: "POST",
-      body: { email, app, role, name },
+      body: { email, app, role, roleName, org, orgName },
     });
   }
 

package/composables/useUtils.ts

@@ -241,6 +241,30 @@ export default function useUtils() {
     };
   }
 
+  function getRouteParam(field = "") {
+    if (!field) return "";
+
+    return (useRoute().params[field] as string) ?? "";
+  }
+
+  function replaceMatch(str: string, match: string, replace: string) {
+    return str.replace(new RegExp(match, "g"), replace);
+  }
+
+  function setRouteParams(...args: Array<Record<string, string>>) {
+    const params: Record<string, string> = {};
+
+    args.forEach((arg) => {
+      Object.entries(arg).forEach(([key, value]) => {
+        if (value !== undefined && value !== null && value !== "") {
+          params[key] = value;
+        }
+      });
+    });
+
+    return params;
+  }
+
   return {
     requiredRule,
     emailRule,
@@ -263,5 +287,8 @@ export default function useUtils() {
     requireListRule,
     convertPermissionsToArray,
     extractMonthYear,
+    getRouteParam,
+    replaceMatch,
+    setRouteParams,
   };
 }

package/composables/useVerification.ts

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

package/nuxt.config.ts

@@ -25,10 +25,7 @@ export default defineNuxtConfig({
       APP_AFFILIATE: (process.env.APP_AFFILIATE as string) ?? "",
       APP_INVENTORY: (process.env.APP_INVENTORY as string) ?? "",
       APP_ASSET: (process.env.APP_ASSET as string) ?? "",
-      APP_ACCOUNTING: (process.env.APP_ACCOUNTING as string) ?? "",
-      APP_BOOK_KEEPING: (process.env.APP_BOOK_KEEPING as string) ?? "",
-      APP_ZONAL: (process.env.APP_ZONAL as string) ?? "",
-      APP_SCHOOL: (process.env.APP_SCHOOL as string) ?? "",
+      APP_FINANCE: (process.env.APP_FINANCE as string) ?? "",
     },
   },
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@goweekdays/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "main": "./nuxt.config.ts",
   "publishConfig": {
     "access": "public"
@@ -27,6 +27,7 @@
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e",
   "dependencies": {
+    "@iconify/vue": "^5.0.0",
     "@mdi/font": "^7.4.47",
     "sass": "^1.80.6",
     "zod": "^3.24.2"

package/plugins/iconify.client.ts

@@ -0,0 +1,5 @@
+import { Icon } from "@iconify/vue";
+
+export default defineNuxtPlugin((nuxtApp) => {
+  nuxtApp.vueApp.component("Icon", Icon);
+});

package/plugins/vuetify.ts

@@ -3,6 +3,8 @@ import "@mdi/font/css/materialdesignicons.css";
 
 import "vuetify/styles";
 import { createVuetify } from "vuetify";
+import { h } from "vue";
+import { Icon } from "@iconify/vue";
 
 const defaultTheme = {
   dark: false,
@@ -34,6 +36,14 @@ export default defineNuxtPlugin((app) => {
         defaultTheme,
       },
     },
+    icons: {
+      defaultSet: "iconify",
+      sets: {
+        iconify: {
+          component: (props: any) => h(Icon, { icon: props.icon }),
+        },
+      },
+    },
   });
 
   app.vueApp.use(vuetify);

package/types/role.d.ts

@@ -3,7 +3,7 @@ declare type TRole = {
   name?: string;
   permissions?: Array<string>;
   type?: string;
-  org: string;
+  org?: string;
   status?: string;
   default?: boolean;
   createdBy?: string;

package/composables/useAdminPermission.ts

@@ -1,127 +0,0 @@
-export default function useAdminPermission() {
-  const permissions: TPermissions = {
-    organizations: {
-      "see-all-organizations": {
-        check: true,
-        description: "Allows the user to view the list of all organizations.",
-      },
-      "see-organization-details": {
-        check: true,
-        description:
-          "Allows the user to view the details of a specific organization.",
-      },
-    },
-    "promo-codes": {
-      "create-promo-code": {
-        check: true,
-        description: "Allows the user to add new promo codes to the system.",
-      },
-      "see-promo-code-details": {
-        check: true,
-        description:
-          "Allows the user to view the details of a specific promo code.",
-      },
-      "edit-promo-code-details": {
-        check: true,
-        description:
-          "Allows the user to update the promo code’s name, discount value, and other settings.",
-      },
-      "change-promo-code-status": {
-        check: true,
-        description:
-          "Allows the user to activate, deactivate, or expire a promo code.",
-      },
-      "delete-promo-code": {
-        check: true,
-        description:
-          "Allows the user to remove a promo code from the system permanently.",
-      },
-    },
-    users: {
-      "see-all-users": {
-        check: true,
-        description: "Allows the user to view the list of all users.",
-      },
-      "see-user-details": {
-        check: true,
-        description: "Allows the user to view the details of a specific user.",
-      },
-    },
-    invitations: {
-      "see-all-invitations": {
-        check: true,
-        description: "Allows the user to view the list of all invitations.",
-      },
-      "see-invitation-details": {
-        check: true,
-        description:
-          "Allows the user to view the details of a specific invitation.",
-      },
-      "edit-invitation-details": {
-        check: true,
-        description:
-          "Allows the user to update the details of a specific invitation.",
-      },
-      "change-invitation-status": {
-        check: true,
-        description: "Allows the user to update the status of an invitation.",
-      },
-      "delete-invitation": {
-        check: true,
-        description:
-          "Allows the user to remove an invitation from the system permanently.",
-      },
-    },
-    members: {
-      "see-all-members": {
-        check: true,
-        description: "Allows the user to view the list of all members.",
-      },
-      "see-member-details": {
-        check: true,
-        description:
-          "Allows the user to view the details of a specific member.",
-      },
-      "change-member-status": {
-        check: true,
-        description: "Allows the user to update the status of a member.",
-      },
-      "remove-member": {
-        check: true,
-        description: "Allows the user to remove a member from the system.",
-      },
-    },
-    "roles-and-permissions": {
-      "view-all-roles": {
-        check: true,
-        description: "Allows the user to view the list of all roles.",
-      },
-      "view-role-details": {
-        check: true,
-        description: "Allows the user to view the details of a specific role.",
-      },
-      "update-role-name": {
-        check: true,
-        description: "Allows the user to edit the name of an existing role.",
-      },
-      "update-role-permissions": {
-        check: true,
-        description:
-          "Allows the user to modify permissions assigned to a role.",
-      },
-      "update-role-status": {
-        check: true,
-        description: "Allows the user to activate or deactivate a role.",
-      },
-      "delete-role": {
-        check: true,
-        description:
-          "Allows the user to remove a role from the system permanently.",
-      },
-    },
-  };
-
-  return {
-    permissions,
-  };
-}