@goweekdays/layer-common 1.0.1 → 1.0.2

package/.playground/nuxt.config.ts

@@ -15,7 +15,6 @@ export default defineNuxtConfig({
       APP_ACCOUNT: (process.env.APP_ACCOUNT as string) ?? "",
       S3_BUCKET_ENDPOINT: (process.env.S3_BUCKET_ENDPOINT as string) ?? "",
       APP_ADMIN: (process.env.APP_ADMIN as string) ?? "",
-      APP_CBA_RECAP: (process.env.APP_CBA_RECAP as string) ?? "",
     },
   },
 });

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @goweekdays/layer-common
 
+## 1.0.2
+
+### Patch Changes
+
+- d4fa4a8: Add finance app
+
 ## 1.0.1
 
 ### Patch Changes

package/components/InvitationMain.vue

@@ -0,0 +1,195 @@
+<template>
+  <v-row no-gutters>
+    <v-col cols="12" class="mb-2">
+      <v-row no-gutters>
+        <v-btn
+          class="text-none mr-2"
+          rounded="pill"
+          variant="tonal"
+          :to="props.inviteRoute"
+          size="large"
+          v-if="props.inviteMember"
+        >
+          Invite member
+        </v-btn>
+      </v-row>
+    </v-col>
+
+    <v-col cols="12">
+      <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="getInvitations()">
+              <v-icon>mdi-refresh</v-icon>
+            </v-btn>
+          </template>
+
+          <template #append>
+            <v-row no-gutters justify="end" align="center">
+              <span class="mr-2 text-caption text-fontgray">
+                {{ pageRange }}
+              </span>
+              <local-pagination
+                v-model="page"
+                :length="pages"
+                @update:value="getInvitations()"
+              />
+            </v-row>
+          </template>
+
+          <template #extension>
+            <v-tabs>
+              <v-tab
+                :to="{
+                  name: 'org-organization-invitations-status-status',
+                  params: { status: 'pending', organization },
+                }"
+              >
+                Pending
+              </v-tab>
+              <v-tab
+                :to="{
+                  name: 'org-organization-invitations-status-status',
+                  params: { status: 'expired', organization },
+                }"
+              >
+                Expired
+              </v-tab>
+            </v-tabs>
+          </template>
+        </v-toolbar>
+
+        <v-data-table
+          :headers="headers"
+          :items="items"
+          item-value="_id"
+          items-per-page="20"
+          fixed-header
+          hide-default-footer
+          hide-default-header
+          class="table-height"
+          :loading="loading"
+          @click:row="tableRowClickHandler"
+        >
+          <template #item.permissions="{ value }">
+            <span class="text-caption font-weight-bold text-capitalize">
+              permissions
+            </span>
+            <v-chip>{{ value.length }}</v-chip>
+          </template>
+        </v-data-table>
+      </v-card>
+    </v-col>
+  </v-row>
+</template>
+
+<script setup lang="ts">
+const props = defineProps({
+  status: {
+    type: String,
+    default: "active",
+  },
+  app: {
+    type: String,
+    default: "organization",
+  },
+  inviteMember: {
+    type: Boolean,
+    default: false,
+  },
+  inviteRoute: {
+    type: Object as PropType<Record<string, any>>,
+    default: () => ({
+      name: "index",
+      params: {},
+    }),
+  },
+});
+
+const organization = (useRoute().params.organization as string) ?? "";
+
+const headers = [
+  {
+    title: "Date",
+    value: "createdAt",
+  },
+  {
+    title: "E-mail",
+    value: "email",
+  },
+  {
+    title: "App",
+    value: "metadata.app",
+  },
+];
+
+const { getVerifications } = useVerification();
+
+const page = ref(1);
+const pages = ref(0);
+const pageRange = ref("-- - -- of --");
+
+const items = ref<Array<Record<string, any>>>([]);
+const { headerSearch } = useLocal();
+
+const {
+  data: getInviteReq,
+  refresh: getInvitations,
+  status: getInviteReqStatus,
+} = await useLazyAsyncData("get-invitations", () =>
+  getVerifications({
+    page: page.value,
+    search: headerSearch.value,
+    status: props.status,
+    type: "user-invite,member-invite",
+    app: props.app,
+  })
+);
+
+const loading = computed(() => getInviteReqStatus.value === "pending");
+
+watchEffect(() => {
+  if (getInviteReq.value) {
+    const _items = getInviteReq.value.items;
+    items.value = _items.length
+      ? _items.map((i: Record<string, any>) => ({
+          ...i,
+          createdAt: new Date(i.createdAt).toLocaleString(),
+        }))
+      : [];
+    pages.value = getInviteReq.value.pages;
+    pageRange.value = getInviteReq.value.pageRange;
+  }
+});
+
+function tableRowClickHandler(_: any, row: any) {
+  const item = items.value[row.index];
+  useRouter().push({
+    name: "roles-permissions-id",
+    params: { id: item._id },
+  });
+}
+
+const selected = ref<Array<string>>([]);
+const selectAll = ref(false);
+
+watch(selectAll, (curr) => {
+  selected.value.splice(0, selected.value.length);
+  if (curr) {
+    const ids = items.value.map((i) => i._id as string);
+    selected.value.push(...ids);
+  }
+});
+</script>
+
+<style scoped>
+.table-height {
+  max-height: calc(100vh - (220px));
+}
+</style>

package/components/Layout/Header.vue

@@ -11,9 +11,9 @@
     </div>
 
     <v-row no-gutters>
-      <v-col cols="6">
+      <v-col cols="12" lg="6" md="9">
         <v-text-field
-          v-model="search"
+          v-model="_search"
           width="100%"
           prepend-inner-icon="mdi-magnify"
           variant="solo-filled"
@@ -171,8 +171,19 @@
 <script setup lang="ts">
 import { useTheme } from "vuetify";
 
+const { getNameInitials, debounce } = useUtils();
+
+const _search = ref("");
+
 const search = defineModel("search", { type: String });
 
+watch(
+  _search,
+  debounce((value) => {
+    search.value = value;
+  }, 1000)
+);
+
 const { redirect, apps, drawer } = useLocal();
 
 const {
@@ -219,8 +230,6 @@ const name = computed(() => {
   return name;
 });
 
-const { getNameInitials } = useUtils();
-
 const defaultApps = computed(() => [
   {
     title: "Account",

package/components/MemberMain.vue

@@ -0,0 +1,452 @@
+<template>
+  <v-row no-gutters>
+    <v-col v-if="props.seatManagement !== 'index'" cols="12" class="mb-2">
+      <v-row no-gutters>
+        <v-btn
+          class="text-none"
+          rounded="pill"
+          variant="tonal"
+          :to="{
+            name: props.seatManagement,
+            params: { organization: props.orgId },
+          }"
+          size="large"
+        >
+          Manage seats
+        </v-btn>
+      </v-row>
+    </v-col>
+
+    <v-col cols="12">
+      <v-card width="100%" variant="outlined" border="thin" rounded="lg">
+        <v-toolbar density="compact" color="grey-lighten-4">
+          <template #prepend>
+            <v-btn fab icon density="comfortable" @click="getAll()">
+              <v-icon>mdi-refresh</v-icon>
+            </v-btn>
+          </template>
+
+          <template #append>
+            <v-row no-gutters justify="end" align="center">
+              <span class="mr-2 text-caption text-font gray">
+                {{ pageRange }}
+              </span>
+              <local-pagination
+                v-model="page"
+                :length="pages"
+                @update:value="getAll()"
+              />
+            </v-row>
+          </template>
+
+          <template #extension>
+            <v-tabs>
+              <v-tab
+                v-for="tab in [
+                  { name: 'Active', status: 'active' },
+                  { name: 'Suspended', status: 'suspended' },
+                ]"
+                :key="tab.status"
+                :to="{
+                  name: props.route,
+                  params: setRouteParams({
+                    status: tab.status,
+                    organization: props.orgId,
+                  }),
+                }"
+              >
+                {{ tab.name }}
+              </v-tab>
+            </v-tabs>
+          </template>
+        </v-toolbar>
+
+        <v-data-table
+          :headers="props.headers"
+          :items="items"
+          item-value="_id"
+          items-per-page="20"
+          fixed-header
+          hide-default-footer
+          style="max-height: calc(100vh - (126px))"
+          :loading="loading"
+        >
+          <template #item.nature="{ item }">
+            {{ replaceMatch(item.nature, "_", " ") }}
+          </template>
+          <template #item.action-table="{ item }">
+            <v-menu
+              v-if="
+                (status === 'active' &&
+                  (canSuspendMembers || canDeleteMembers)) ||
+                (status === 'suspended' &&
+                  (canActivateMembers || canDeleteMembers))
+              "
+              v-model="item.menuOpen"
+              offset-y
+              width="150"
+            >
+              <template v-slot:activator="{ props }">
+                <v-icon v-bind="props">mdi-dots-horizontal</v-icon>
+              </template>
+              <v-list>
+                <v-list-item
+                  v-if="props.assignRole"
+                  @click="
+                    setMember({
+                      dialog: true,
+                      mode: 'assign-role',
+                      role: item,
+                    })
+                  "
+                >
+                  Assign Role
+                </v-list-item>
+
+                <v-list-item
+                  v-if="status === 'active' && canSuspendMembers"
+                  @click="openUpdateDialog(item.user, 'suspended')"
+                >
+                  Suspend
+                </v-list-item>
+                <v-list-item
+                  v-if="status === 'suspended' && canActivateMembers"
+                  @click="openUpdateDialog(item.user, 'active')"
+                >
+                  Activate
+                </v-list-item>
+                <v-list-item
+                  v-if="canDeleteMembers"
+                  @click="openUpdateDialog(item.user, 'deleted')"
+                >
+                  Delete
+                </v-list-item>
+              </v-list>
+            </v-menu>
+          </template>
+        </v-data-table>
+      </v-card>
+    </v-col>
+    <ConfirmDialog
+      v-model="confirmDialog"
+      :loading="updateLoading"
+      @submit="handleUpdateMemberStatus"
+    >
+      <template #title>
+        <span class="font-weight-medium text-h5">
+          {{ updateActionText }} Member</span
+        >
+      </template>
+
+      <template #description>
+        <p class="text-subtitle-2">
+          Are you sure you want to {{ updateActionText }} this Member? This
+          action cannot be undone.
+        </p>
+      </template>
+
+      <template #footer>
+        <v-btn
+          variant="text"
+          @click="confirmDialog = false"
+          :disabled="updateLoading"
+        >
+          Close
+        </v-btn>
+        <v-btn
+          color="primary"
+          variant="flat"
+          @click="handleUpdateMemberStatus"
+          :loading="updateLoading"
+        >
+          {{ updateActionText }} Member
+        </v-btn>
+      </template>
+    </ConfirmDialog>
+
+    <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
+
+    <v-dialog v-model="assignRoleDialog" max-width="400px">
+      <v-card>
+        <v-card-title class="text-h5">Assign Role</v-card-title>
+        <v-card-text>
+          <v-form v-model="memberRoleForm" @submit.prevent="updateMemberRole()">
+            <v-row no-gutters>
+              <v-col cols="12" class="mb-2">
+                <v-row no-gutters>
+                  <InputLabel class="text-capitalize" title="Name" required />
+                  <v-col cols="12">
+                    <v-select
+                      v-model="selectedRole"
+                      :items="roles"
+                      item-value="_id"
+                      item-title="name"
+                      density="comfortable"
+                      :rules="[requiredRule]"
+                      :error-messages="
+                        selectedRole === selectedMemberRole
+                          ? 'Role already assigned'
+                          : ''
+                      "
+                      persistent-hint
+                    ></v-select>
+                  </v-col>
+
+                  <v-col cols="12" class="text-error text-center">
+                    {{ message }}
+                  </v-col>
+                </v-row>
+              </v-col>
+
+              <v-col cols="12">
+                <v-row>
+                  <v-col cols="6">
+                    <v-btn
+                      block
+                      variant="text"
+                      @click="setMember({ mode: 'assign-role' })"
+                    >
+                      Cancel
+                    </v-btn>
+                  </v-col>
+                  <v-col cols="6">
+                    <v-btn
+                      block
+                      variant="flat"
+                      color="black"
+                      :disabled="!memberRoleForm"
+                      type="submit"
+                    >
+                      Submit
+                    </v-btn>
+                  </v-col>
+                </v-row>
+              </v-col>
+            </v-row>
+          </v-form>
+        </v-card-text>
+      </v-card>
+    </v-dialog>
+  </v-row>
+</template>
+
+<script setup lang="ts">
+const props = defineProps({
+  orgId: {
+    type: String,
+    default: "",
+  },
+  customerId: {
+    type: String,
+    default: "",
+  },
+  siteId: {
+    type: String,
+    default: "",
+  },
+  status: {
+    type: String,
+    default: "active",
+  },
+  type: {
+    type: String,
+    default: "organization",
+  },
+  seatManagement: {
+    type: String,
+    default: "index",
+  },
+  inviteMember: {
+    type: String,
+    default: "index",
+  },
+  route: {
+    type: String,
+    default: "index",
+  },
+  canActivateMembers: {
+    type: Boolean,
+    default: false,
+  },
+  canSuspendMembers: {
+    type: Boolean,
+    default: false,
+  },
+  canDeleteMembers: {
+    type: Boolean,
+    default: false,
+  },
+  assignRole: {
+    type: Boolean,
+    default: false,
+  },
+  headers: {
+    type: Array as PropType<Array<Record<string, string>>>,
+    default: () => [
+      {
+        title: "Name",
+
+        value: "name",
+      },
+      {
+        title: "Role",
+
+        value: "roleName",
+      },
+      {
+        title: "Organization",
+
+        value: "orgName",
+      },
+      {
+        title: "Action",
+        value: "action-table",
+      },
+    ],
+  },
+});
+
+const items = ref<Array<Record<string, any>>>([]);
+const page = ref(1);
+const pages = ref(10);
+const pageRange = ref("-- - -- of --");
+
+const message = ref("");
+const messageSnackbar = ref(false);
+const messageColor = ref("");
+
+const {
+  getAll: _getAll,
+  updateMemberStatus: _updateMemberStatus,
+  updateMemberRole: _updateMemberRole,
+} = useMember();
+
+const { headerSearch } = useLocal();
+const { replaceMatch, setRouteParams, requiredRule } = useUtils();
+
+const {
+  data: getAllReq,
+  refresh: getAll,
+  status: getAllReqStatus,
+} = useLazyAsyncData("get-all-members-by-status" + props.status, () =>
+  _getAll({
+    status: props.status,
+    org: props.orgId,
+    search: headerSearch.value,
+    page: page.value,
+    type: props.type,
+  })
+);
+
+const loading = computed(() => getAllReqStatus.value === "pending");
+
+watchEffect(() => {
+  if (getAllReq.value) {
+    items.value = getAllReq.value.items;
+    pages.value = getAllReq.value.pages;
+    pageRange.value = getAllReq.value.pageRange;
+  }
+});
+
+watch(headerSearch, () => {
+  getAll();
+});
+
+const confirmDialog = ref(false);
+const selectedMemberId = ref<string | null>(null);
+const updateLoading = ref(false);
+const updateAction = ref("");
+
+const memberRoleForm = ref(false);
+const assignRoleDialog = ref(false);
+const selectedRole = ref<string | null>(null);
+const selectedMemberRole = ref("");
+
+function setMember({
+  dialog = false,
+  mode = "",
+  role = {} as Record<string, any>,
+} = {}) {
+  if (mode === "assign-role") {
+    assignRoleDialog.value = dialog;
+  }
+
+  selectedMemberId.value = role._id;
+  selectedRole.value = role.role;
+  selectedMemberRole.value = role.role;
+}
+
+const roles = ref<Array<Record<string, any>>>([]);
+const { getRoles } = useRole();
+const { data: getAllRoleReq } = useLazyAsyncData("get-roles", () =>
+  getRoles({ org: props.orgId, type: props.type, limit: 20 })
+);
+
+watchEffect(() => {
+  if (getAllRoleReq.value) {
+    roles.value = getAllRoleReq.value.items;
+  }
+});
+
+watchEffect(() => {
+  if (selectedRole.value) {
+    message.value = "";
+  }
+});
+
+async function updateMemberRole() {
+  try {
+    await _updateMemberRole(
+      selectedMemberId.value ?? "",
+      selectedRole.value ?? "",
+      props.type,
+      props.orgId
+    );
+    await setMember({ mode: "assign-role" });
+    await getAll();
+  } catch (error: any) {
+    message.value = error?.response?._data?.message || "Failed to update role";
+  }
+}
+
+function openUpdateDialog(id: string, action: string) {
+  updateAction.value = action;
+  selectedMemberId.value = id;
+  confirmDialog.value = true;
+}
+
+function showMessage(msg: string, color: string) {
+  message.value = msg;
+  messageColor.value = color;
+  messageSnackbar.value = true;
+}
+
+async function handleUpdateMemberStatus() {
+  if (!selectedMemberId.value) return;
+  updateLoading.value = true;
+  try {
+    const res = await _updateMemberStatus(
+      selectedMemberId.value,
+      updateAction.value
+    );
+
+    confirmDialog.value = false;
+    showMessage(res.message, "success");
+    getAll();
+  } catch (error: any) {
+    const errorMessage = error?.response?._data?.message;
+    showMessage(errorMessage, "error");
+  } finally {
+    updateLoading.value = false;
+    selectedMemberId.value = null;
+  }
+}
+const updateActionText = computed(() => {
+  const map: Record<string, string> = {
+    active: "Activate",
+    suspended: "Suspend",
+    deleted: "Delete",
+  };
+  return map[updateAction.value] || updateAction.value;
+});
+</script>

package/components/RolePermissionMain.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-row no-gutters class="px-4 pt-1 pb-2">
+  <v-row no-gutters>
     <v-col cols="12" class="mb-2">
       <v-row no-gutters>
         <v-btn

package/composables/useCommonPermission.ts

@@ -1,5 +1,5 @@
 export function useCommonPermissions() {
-  const invitationPermission: Record<string, TPermission> = {
+  const invitationPermissions: Record<string, TPermission> = {
     "create-invitation": {
       check: true,
       description:
@@ -23,6 +23,11 @@ export function useCommonPermissions() {
       description:
         "Allows the user to view the list of all members in the organization.",
     },
+    "assign-member-role": {
+      check: true,
+      description:
+        "Allows the user to assign a specific role to a member in the organization.",
+    },
     "suspend-member": {
       check: true,
       description: "Allows the user to suspend a member's account temporarily.",
@@ -63,9 +68,63 @@ export function useCommonPermissions() {
     },
   };
 
+  const feedbackPermissions: Record<string, TPermission> = {
+    "add-feedback": {
+      check: true,
+      description: "Allows the user to create a new feedback.",
+    },
+    "see-all-feedback": {
+      check: true,
+      description: "Allows the user to view the list of all feedback.",
+    },
+    "see-feedback-details": {
+      check: true,
+      description:
+        "Allows the user to view the details of a specific feedback.",
+    },
+    "delete-feedback": {
+      check: true,
+      description:
+        "Allows the user to remove a feedback from the system permanently.",
+    },
+    "update-feedback": {
+      check: true,
+      description:
+        "Allows the user to update the details of an existing feedback.",
+    },
+  };
+
+  const workOrderPermissions: Record<string, TPermission> = {
+    "create-work-order": {
+      check: true,
+      description: "Allows the user to create a new work order.",
+    },
+    "see-all-work-orders": {
+      check: true,
+      description: "Allows the user to view the list of all work orders.",
+    },
+    "see-work-order-details": {
+      check: true,
+      description:
+        "Allows the user to view the details of a specific work order.",
+    },
+    "delete-work-order": {
+      check: true,
+      description:
+        "Allows the user to remove a work order from the system permanently.",
+    },
+    "update-work-order": {
+      check: true,
+      description:
+        "Allows the user to update the details of an existing work order.",
+    },
+  };
+
   return {
-    invitationPermission,
+    invitationPermissions,
     memberPermissions,
     rolePermissions,
+    feedbackPermissions,
+    workOrderPermissions,
   };
 }

package/composables/useLocal.ts

@@ -9,28 +9,15 @@ export default function useLocal() {
 
   const drawer = useState("drawer", () => true);
 
-  const {
-    APP_INVENTORY,
-    APP_ASSET,
-    APP_BOOK_KEEPING,
-    APP_ACCOUNTING,
-    APP_ZONAL,
-    APP_SCHOOL,
-  } = appConfig;
+  const { APP_INVENTORY, APP_ASSET, APP_FINANCE } = appConfig;
   const { currentOrg } = useOrg();
 
   const apps = computed(() => {
     return [
       {
-        title: "Accounting",
+        title: "Finance",
         icon: "mdi-file-document-multiple",
-        link: APP_ACCOUNTING as string,
-        landingPage: `org/${currentOrg.value ?? ""}`,
-      },
-      {
-        title: "Bookkeeping",
-        icon: "mdi-file-document-edit-outline",
-        link: APP_BOOK_KEEPING as string,
+        link: APP_FINANCE as string,
         landingPage: `org/${currentOrg.value ?? ""}`,
       },
       {
@@ -45,18 +32,6 @@ export default function useLocal() {
         link: APP_ASSET as string,
         landingPage: `org/${currentOrg.value ?? ""}`,
       },
-      {
-        title: "Zonal",
-        icon: "mdi-hospital-marker",
-        link: APP_ZONAL as string,
-        landingPage: `org/${currentOrg.value ?? ""}`,
-      },
-      {
-        title: "School",
-        icon: "mdi-school",
-        link: APP_SCHOOL as string,
-        landingPage: `org/${currentOrg.value ?? ""}`,
-      },
     ];
   });
 

package/composables/useLocalAuth.ts

@@ -4,6 +4,10 @@ export default function useLocalAuth() {
   const currentUser = useState<TUser | null>("currentUser", () => null);
 
   function authenticate() {
+    if (currentUser.value) {
+      return;
+    }
+
     // Get access token from cookies
     const accessToken = useCookie("accessToken", cookieConfig).value;
 

package/composables/useLocalSetup.ts

@@ -0,0 +1,38 @@
+export function useLocalSetup(type: string) {
+  const { currentUser } = useLocalAuth();
+
+  const userId = computed(() => currentUser.value?._id ?? "");
+
+  const { getByUserIdType } = useMember();
+
+  const { data: userMemberData } = useLazyAsyncData(
+    "get-member-by-id",
+    () => getByUserIdType(userId.value, type),
+    { watch: [userId], immediate: false }
+  );
+
+  const { getRoleById } = useRole();
+
+  const roleId = computed(() => userMemberData.value?.role ?? "");
+
+  const userAppRole = useState<Record<string, any> | null>(
+    "userAppRole",
+    () => null
+  );
+
+  const { data: getRoleByIdReq } = useLazyAsyncData(
+    "get-role-by-id",
+    () => getRoleById(roleId.value),
+    { watch: [roleId], immediate: false }
+  );
+
+  watchEffect(() => {
+    if (getRoleByIdReq.value) {
+      userAppRole.value = getRoleByIdReq.value;
+    }
+  });
+
+  return {
+    userAppRole,
+  };
+}

package/composables/useMember.ts

@@ -1,86 +1,104 @@
 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 getByUserIdType(user: string, type: string) {
+    return useNuxtApp().$api<TMember>(`/api/members/user/${user}/app/${type}`);
   }
 
-  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,
+    getByUserIdType,
+    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.2",
   "main": "./nuxt.config.ts",
   "publishConfig": {
     "access": "public"

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,
-  };
-}