@eeplatform/nuxt-layer-common 1.4.3 → 1.4.6

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @eeplatform/nuxt-layer-common
 
+## 1.4.6
+
+### Patch Changes
+
+- fe4bc02: Add get all function to enrollment composable
+
+## 1.4.5
+
+### Patch Changes
+
+- f413853: Removed enrollment composable present data
+
+## 1.4.4
+
+### Patch Changes
+
+- c358eb1: Update dependencies
+
 ## 1.4.3
 
 ### Patch Changes

package/components/EnrollmentForm.vue

@@ -305,7 +305,7 @@
                   required
                 />
                 <v-col cols="12">
-                  <v-combobox
+                  <v-autocomplete
                     v-model="enrollment.learnerInfo.placeOfBirth"
                     :rules="[requiredRule]"
                     :items="citiesMunicipalities"
@@ -321,7 +321,7 @@
                         </v-list-item-title>
                       </v-list-item>
                     </template>
-                  </v-combobox>
+                  </v-autocomplete>
                 </v-col>
               </v-row>
             </v-col>

package/components/InvitationForm.vue

@@ -21,7 +21,7 @@
             </v-row>
           </v-col>
 
-          <v-col cols="12" class="my-2">
+          <v-col cols="12" class="mt-2 mb-4">
             <v-row no-gutters>
               <v-col cols="12">
                 <v-input

package/composables/useEnrollment.ts

@@ -9,7 +9,7 @@ export default function useEnrollment() {
     province: "",
     cityMunicipality: "",
     schoolYear: "",
-    gradeLevel: "K1",
+    gradeLevel: "",
     returningLearner: false,
     learnerInfo: {
       psaBirthCertificateNo: "",
@@ -89,8 +89,21 @@ export default function useEnrollment() {
     });
   }
 
+  function getAll({
+    school = "",
+    status = "pending",
+    page = 1,
+    limit = 10,
+    search = "",
+  } = {}) {
+    return $fetch<Record<string, any>>("/api/basic-education/enrollments", {
+      query: { school, status, page, limit, search },
+    });
+  }
+
   return {
     enrollment,
     add,
+    getAll,
   };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@eeplatform/nuxt-layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.4.3",
+  "version": "1.4.6",
   "main": "./nuxt.config.ts",
   "publishConfig": {
     "access": "public"
@@ -23,7 +23,7 @@
     "typescript": "^5.6.3",
     "vite-plugin-vuetify": "^2.0.4",
     "vue": "latest",
-    "vuetify": "^3.10.8"
+    "vuetify": "^3.10.11"
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e",
   "dependencies": {

package/pages/require-membership.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">
+      Membership 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/admin.client.ts

@@ -0,0 +1,45 @@
+export default defineNuxtPlugin(() => {
+  const router = useRouter();
+  const { getByUserType } = useMember();
+  const { getRoleById } = useRole();
+
+  const { userAppRole, id } = useLocalSetup();
+
+  router.afterEach((to) => {
+    const isMember = to.meta?.member;
+    if (!isMember) return;
+
+    const APP = useRuntimeConfig().public.APP;
+    const org = (to.params.org as string) ?? "";
+
+    const userId = computed(() => useCookie("user").value ?? "");
+
+    const { data: userMemberData, error: userMemberError } = useLazyAsyncData(
+      "get-member-by-id",
+      () => getByUserType(userId.value, APP, org),
+      { watch: [userId] }
+    );
+
+    watchEffect(() => {
+      if (userMemberError.value) {
+        navigateTo({
+          name: "require-membership",
+        });
+      }
+    });
+
+    const roleId = computed(() => userMemberData.value?.role ?? "");
+
+    const { data: getRoleByIdReq } = useLazyAsyncData(
+      "get-role-by-id",
+      () => getRoleById(roleId.value),
+      { watch: [roleId], immediate: false }
+    );
+
+    watchEffect(() => {
+      if (getRoleByIdReq.value) {
+        userAppRole.value = getRoleByIdReq.value;
+      }
+    });
+  });
+});