@eeplatform/nuxt-layer-common 1.2.0 → 1.2.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eeplatform/nuxt-layer-common
 
+## 1.2.2
+
+### Patch Changes
+
+- 49f4a58: Revise authentication implementation
+
+## 1.2.1
+
+### Patch Changes
+
+- e217ab9: Admin school management adjustment
+
 ## 1.2.0
 
 ### Minor Changes

package/components/NavigationItem.vue

@@ -50,7 +50,7 @@ const prop = defineProps({
   route: {
     type: Object,
     default() {
-      return { name: "", params: {} };
+      return { name: "", params: {}, query: {} };
     },
   },
   children: {

package/components/RolePermissionFormCreate.vue

@@ -114,7 +114,7 @@ const props = defineProps({
     type: Object,
     default: () => ({}),
   },
-  org: {
+  id: {
     type: String,
     default: "",
   },
@@ -150,7 +150,7 @@ async function submit() {
       name: name.value,
       permissions: selectedPermissions.value,
       type: type.value,
-      org: props.org,
+      id: props.id,
     });
 
     if (createMore.value) {

package/components/RolePermissionMain.vue

@@ -82,7 +82,7 @@
       <RolePermissionFormCreate
         @cancel="createDialog = false"
         :permissions="props.permissions"
-        :org="props.orgId"
+        :id="props.id"
         @success="success()"
         v-model:type="type"
         :types="props.types"
@@ -144,7 +144,7 @@
 
 <script setup lang="ts">
 const props = defineProps({
-  orgId: {
+  id: {
     type: String,
     default: "",
   },
@@ -224,7 +224,7 @@ const {
       page: page.value,
       search: headerSearch.value,
       type: type.value,
-      org: props.orgId,
+      id: props.id,
     }),
   {
     watch: [page, headerSearch],

package/composables/useDivision.ts

@@ -0,0 +1,64 @@
+export default function useDivision() {
+  function getAll({ page = 1, search = "", limit = 20, region = "" } = {}) {
+    return useNuxtApp().$api<Record<string, any>>("/api/divisions", {
+      method: "GET",
+      query: {
+        page,
+        search,
+        limit,
+        region,
+      },
+    });
+  }
+
+  function getById(id = "") {
+    return useNuxtApp().$api<Record<string, any>>(`/api/divisions/id/${id}`, {
+      method: "GET",
+    });
+  }
+
+  function getByName(name = "") {
+    return useNuxtApp().$api(`/api/divisions/name/${name}`, {
+      method: "GET",
+    });
+  }
+
+  function createDivision(data: Record<string, any>) {
+    return useNuxtApp().$api("/api/divisions", {
+      method: "POST",
+      body: data,
+    });
+  }
+
+  function updateDivisionField(id: string, field: string, value: string) {
+    return useNuxtApp().$api(`/api/divisions/${id}`, {
+      method: "PATCH",
+      body: { field, value },
+    });
+  }
+
+  function deleteDivision(id: string) {
+    return useNuxtApp().$api(`/api/divisions/${id}`, {
+      method: "DELETE",
+    });
+  }
+
+  const division = ref({
+    _id: "",
+    name: "",
+    region: "",
+    regionName: "",
+    superintendent: "",
+    superintendentName: "",
+  });
+
+  return {
+    division,
+    getAll,
+    getById,
+    getByName,
+    createDivision,
+    updateDivisionField,
+    deleteDivision,
+  };
+}

package/composables/useLocal.ts

@@ -30,19 +30,19 @@ export default function useLocal() {
         title: "School",
         icon: "ph:building-bold",
         link: APP_SCHOOL as string,
-        landingPage: "home",
+        landingPage: "",
       },
       {
         title: "Division",
         icon: "ph:building-apartment-bold",
         link: APP_DIVISION as string,
-        landingPage: "home",
+        landingPage: "",
       },
       {
         title: "Region",
         icon: "ph:buildings-bold",
         link: APP_REGION as string,
-        landingPage: "home",
+        landingPage: "",
       },
     ];
   });

package/composables/useLocalAuth.ts

@@ -38,7 +38,7 @@ export default function useLocalAuth() {
   }
 
   async function login({ email = "", password = "", role = "" }) {
-    return useNuxtApp().$api<TKeyValuePair>("/api/auth/login", {
+    return useNuxtApp().$api<Record<string, any>>("/api/auth/login", {
       method: "POST",
       body: JSON.stringify({ email, password, role }),
     });
@@ -78,19 +78,17 @@ export default function useLocalAuth() {
     }
   }
 
-  async function getCurrentUser() {
+  function getCurrentUser() {
     const user = useCookie("user", cookieConfig).value;
-    if (!user) return null;
-    try {
-      const _user = await useNuxtApp().$api<TUser>(`/api/users/id/${user}`, {
-        method: "GET",
-      });
+    const { data: userData } = useLazyAsyncData("get-current-user", () =>
+      useNuxtApp().$api<TUser>(`/api/users/id/${user}`)
+    );
 
-      currentUser.value = _user;
-      return _user;
-    } catch (error) {
-      console.log("Error fetching current user:", error);
-    }
+    watchEffect(() => {
+      if (userData.value) {
+        currentUser.value = userData.value;
+      }
+    });
   }
 
   async function forgotPassword(email: string) {
@@ -129,13 +127,13 @@ export default function useLocalAuth() {
   }
 
   function verify(id: string) {
-    return useNuxtApp().$api<TKeyValuePair>(`/api/auth/verify/${id}`, {
+    return useNuxtApp().$api<Record<string, any>>(`/api/auth/verify/${id}`, {
       method: "GET",
     });
   }
 
   function signUp(email: string, referral: string) {
-    return useNuxtApp().$api<TKeyValuePair>("/api/auth/sign-up", {
+    return useNuxtApp().$api<Record<string, any>>("/api/auth/sign-up", {
       method: "POST",
       body: { email, referral },
     });

package/composables/useLocalSetup.ts

@@ -1,14 +1,12 @@
 export function useLocalSetup(type: string, org?: string) {
-  const { currentUser } = useLocalAuth();
-
-  const userId = computed(() => currentUser.value?._id ?? "");
+  const userId = computed(() => useCookie("user").value ?? "");
 
   const { getByUserType } = useMember();
 
   const { data: userMemberData, error: userMemberError } = useLazyAsyncData(
     "get-member-by-id",
     () => getByUserType(userId.value, type, org),
-    { watch: [userId], immediate: false }
+    { watch: [userId] }
   );
 
   watchEffect(() => {
@@ -40,7 +38,10 @@ export function useLocalSetup(type: string, org?: string) {
     }
   });
 
+  const id = computed(() => userMemberData.value?.org ?? "id");
+
   return {
     userAppRole,
+    id,
   };
 }

package/composables/useRegion.ts

@@ -0,0 +1,62 @@
+export default function useRegion() {
+  function getAll({ page = 1, search = "", limit = 20 } = {}) {
+    return useNuxtApp().$api<Record<string, any>>("/api/regions", {
+      method: "GET",
+      query: {
+        page,
+        search,
+        limit,
+      },
+    });
+  }
+
+  function getById(id = "") {
+    return useNuxtApp().$api<Record<string, any>>(`/api/regions/id/${id}`, {
+      method: "GET",
+    });
+  }
+
+  function getByName(name = "") {
+    return useNuxtApp().$api(`/api/regions/name/${name}`, {
+      method: "GET",
+    });
+  }
+
+  function createRegion(data: Record<string, any>) {
+    return useNuxtApp().$api("/api/regions", {
+      method: "POST",
+      body: data,
+    });
+  }
+
+  function updateRegionField(id: string, field: string, value: string) {
+    return useNuxtApp().$api(`/api/regions/${id}`, {
+      method: "PATCH",
+      body: { field, value },
+    });
+  }
+
+  function deleteRegion(id: string) {
+    return useNuxtApp().$api(`/api/regions/${id}`, {
+      method: "DELETE",
+    });
+  }
+
+  const region = ref({
+    _id: "",
+    name: "",
+    director: "",
+    directorName: "",
+  });
+
+  return {
+    region,
+    getAll,
+    getById,
+    getByName,
+    createRegion,
+    updateRegionField,
+    deleteRegion,
+  };
+}
+

package/composables/useRole.ts

@@ -1,15 +1,15 @@
 export default function useRole() {
   function createRole(
-    { name, permissions, type, org } = {} as {
+    { name, permissions, type, id } = {} as {
       name: string;
       permissions: Array<string>;
       type: string;
-      org: string;
+      id: string;
     }
   ) {
     return useNuxtApp().$api("/api/roles", {
       method: "POST",
-      body: { name, permissions, type, org },
+      body: { name, permissions, type, id },
     });
   }
 
@@ -18,11 +18,11 @@ export default function useRole() {
     page = 1,
     limit = 20,
     type = "",
-    org = "",
+    id = "",
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>("/api/roles", {
       method: "GET",
-      query: { search, page, limit, type, org },
+      query: { search, page, limit, type, id },
     });
   }
 
@@ -67,7 +67,7 @@ export default function useRole() {
     return {
       _id: "",
       name: "",
-      org: "",
+      id: "",
       permissions: [],
       createdAt: "",
       updatedAt: "",

package/composables/useSchool.ts

@@ -0,0 +1,46 @@
+export default function useSchool() {
+  function registerSchool(school: TSchool) {
+    return useNuxtApp().$api("/api/schools/register", {
+      method: "POST",
+      body: school,
+    });
+  }
+
+  function getPendingByCreatedBy(createdBy: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/schools/createdBy/${createdBy}`,
+      {
+        method: "GET",
+      }
+    );
+  }
+
+  function approvedById(id: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/schools/approve/${id}`,
+      {
+        method: "PATCH",
+      }
+    );
+  }
+
+  function getAll({
+    page = 1,
+    status = "active",
+    search = "",
+    region = "",
+    division = "",
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>("/api/schools", {
+      method: "GET",
+      query: { page, status, search, region, division },
+    });
+  }
+
+  return {
+    registerSchool,
+    getPendingByCreatedBy,
+    getAll,
+    approvedById,
+  };
+}

package/package.json

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

package/types/local.d.ts

@@ -6,7 +6,8 @@ declare type TToken = {
 
 declare type TNavigationRoute = {
   name: string;
-  params?: TKeyValuePair;
+  params?: Record<string, any>;
+  query?: Record<string, any>;
 };
 
 declare type TNavigationItem = {
@@ -16,10 +17,3 @@ declare type TNavigationItem = {
   children?: TNavigationItem[];
   disabled?: boolean;
 };
-
-declare type TKeyValuePair<
-  K extends string | number | symbol = string,
-  V = string | number | object | Array | TKeyValuePair
-> = {
-  [key in K]: V;
-};

package/types/role.d.ts

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

package/types/school.d.ts

@@ -0,0 +1,23 @@
+declare type TSchool = {
+  _id?: string;
+  id: string;
+  name: string;
+  country: string;
+  address: string;
+  continuedAddress: string;
+  city: string;
+  province: string;
+  postalCode: string;
+  courses: Array<string>;
+  principalName: string;
+  principalEmail: string;
+  principalNumber: string;
+  region: string;
+  regionName?: string;
+  division: string;
+  divisionName?: string;
+  status?: string;
+  createdAt?: string;
+  updatedAt?: string;
+  createdBy?: string;
+};