@iservice365/layer-common 0.2.1 → 1.0.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.0.0
+
+### Major Changes
+
+- d24ed34: Building mgmt initial release
+
+## 0.2.2
+
+### Patch Changes
+
+- c627e9b: Switch to session based auth
+
 ## 0.2.1
 
 ### Patch Changes

package/components/FeedbackMain.vue

@@ -173,6 +173,8 @@ const message = ref("");
 const messageColor = ref("");
 const messageSnackbar = ref(false);
 
+const { getUserFromCookie } = useLocal();
+
 const serviceProviders = ref<
   Array<{ title: string; value: string; subtitle: string }>
 >([]);
@@ -345,6 +347,9 @@ function handleCloseDialog() {
 const _feedbackId = ref<string | null>(null);
 
 async function _createFeedback(organization: string, site: string) {
+
+  const userId = getUserFromCookie();
+
   const createPayload: TFeedbackCreate = {
     subject: _feedback.value.subject,
     category: _feedback.value.category,
@@ -356,6 +361,7 @@ async function _createFeedback(organization: string, site: string) {
     assignee: _feedback.value.assignee || "",
     organization,
     site,
+    ...(userId !== null ? {createdBy: userId } : {}),
   };
 
   const response = await createFeedback(createPayload);

package/components/InputLabel.vue

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

package/components/Layout/NavigationDrawer.vue

@@ -12,19 +12,18 @@
         :key="`${navigationItem.title}-${navigationIndex}`"
       >
         <NavigationItem
-          v-if="navigationItem.route && navigationItem.route.name"
+          v-if="navigationItem.children?.length"
           :title="navigationItem.title"
           :icon="navigationItem.icon"
-          :route="navigationItem.route"
           :children="navigationItem.children"
         />
 
         <NavigationItem
-          v-else-if="navigationItem.link"
+          v-else-if="navigationItem.route"
           :title="navigationItem.title"
           :icon="navigationItem.icon"
           :link="navigationItem.link"
-          :children="navigationItem.children"
+          :route="navigationItem.route"
         />
       </template>
 

package/composables/useLocalAuth.ts

@@ -4,14 +4,6 @@ export default function useLocalAuth() {
   const currentUser = useState<TUser | null>("currentUser", () => null);
 
   function authenticate() {
-    // Get access token from cookies
-    const accessToken = useCookie("accessToken", cookieConfig).value;
-
-    if (!accessToken) {
-      // Redirect to login page if no access token
-      navigateTo({ name: "index" });
-    }
-
     const user = useCookie("user", cookieConfig).value;
 
     const { data: getCurrentUserReq, error: getCurrentUserErr } =

package/composables/useLocalSetup.ts

@@ -1,8 +1,5 @@
 export function useLocalSetup() {
-  const userAppRole = useState<Record<string, any> | null>(
-    "userAppRole",
-    () => null
-  );
+  const userAppRole = useState<TRole | null>("userAppRole", () => null);
 
   const id = useState<string | null>("memberShipOrgId", () => null);
 

package/composables/useOrg.ts

@@ -1,5 +1,11 @@
 export default function useOrg() {
-  function getOrgs({ page = 1, search = "", user = "", limit = 20 } = {}) {
+  function getOrgs({
+    page = 1,
+    search = "",
+    user = "",
+    limit = 20,
+    type = "organization",
+  } = {}) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/organizations/user/${user}`,
       {
@@ -8,6 +14,7 @@ export default function useOrg() {
           page,
           search,
           limit,
+          type,
         },
       }
     );

package/composables/useSite.ts

@@ -12,6 +12,7 @@ export default function useSite() {
       name: "",
       description: "",
       orgId: "",
+      blocks: 0,
       customerOrgId: "",
       customerSiteId: "",
       createdAt: "",
@@ -73,7 +74,7 @@ export default function useSite() {
   }
 
   async function getSiteById(id: string) {
-    return useNuxtApp().$api<TCustomer>(`/api/sites/${id}`, {
+    return useNuxtApp().$api<TSite>(`/api/sites/${id}`, {
       method: "GET",
     });
   }

package/composables/useSubscription.ts

@@ -89,6 +89,7 @@ export default function useSubscription() {
     organization?: TOrg;
     billingAddress: TAddress;
     promoCode?: string;
+    user?: string;
   };
 
   function initOrgSubscription(value: TSub) {

package/composables/useUtils.ts

@@ -295,6 +295,12 @@ export default function useUtils() {
     return params;
   }
 
+  function toOrdinal(n: number): string {
+    const s = ["th", "st", "nd", "rd"];
+    const v = n % 100;
+    return n + (s[(v - 20) % 10] || s[v] || s[0]);
+  }
+
   return {
     requiredRule,
     emailRule,
@@ -324,5 +330,6 @@ export default function useUtils() {
     formatNature,
     replaceMatch,
     setRouteParams,
+    toOrdinal,
   };
 }

package/middleware/01.auth.ts

@@ -2,9 +2,9 @@ export default defineNuxtRouteMiddleware(async () => {
   const { cookieConfig } = useRuntimeConfig().public;
 
   // Get access token from cookies
-  const accessToken = useCookie("accessToken", cookieConfig).value;
+  const sid = useCookie("sid", cookieConfig).value;
 
-  if (!accessToken) {
+  if (!sid) {
     // Redirect to login page if no access token
     return navigateTo({ name: "index" });
   }

package/package.json

@@ -2,11 +2,8 @@
   "name": "@iservice365/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "0.2.1",
+  "version": "1.0.0",
   "main": "./nuxt.config.ts",
-  "publishConfig": {
-    "access": "public"
-  },
   "scripts": {
     "dev": "nuxi dev .playground",
     "dev:prepare": "nuxt prepare .playground",

package/types/feedback.d.ts

@@ -18,6 +18,7 @@ declare type TFeedback = {
   highPriority?: boolean;
   serviceProvider?: string;
   assignee?: string;
+  createdBy?: string;
 };
 
 declare type TFeedbackMetadata = {
@@ -43,6 +44,7 @@ declare type TFeedbackCreate = Pick<
   | "assignee"
   | "organization"
   | "site"
+  | "createdBy"
 >;
 
 declare type TFeedbackUpdate = Pick<

package/types/site.d.ts

@@ -3,6 +3,7 @@ declare type TSite = {
   name: string;
   description: string;
   orgId: string;
+  blocks?: number;
   customerOrgId: string;
   customerSiteId: string;
   createdAt?: string;