@goweekdays/layer-common 1.4.6 → 1.5.1

package/composables/useUser.ts

@@ -7,49 +7,49 @@ export default function useUser() {
     org = "",
     orgName = "",
   } = {}) {
-    return $fetch<Record<string, any>>("/api/auth/invite", {
+    return useNuxtApp().$api<Record<string, any>>("/api/auth/invite", {
       method: "POST",
       body: { email, app, role, roleName, org, orgName },
     });
   }
 
   function updateName({ firstName = "", lastName = "" } = {}) {
-    return $fetch<Record<string, any>>("/api/users/name", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/name", {
       method: "PUT",
       body: { firstName, lastName },
     });
   }
 
   function updateBirthday({ month = "", day = 0, year = 0 } = {}) {
-    return $fetch<Record<string, any>>("/api/users/birthday", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/birthday", {
       method: "PUT",
       body: { month, day, year },
     });
   }
 
   function updateGender(gender = "") {
-    return $fetch<Record<string, any>>("/api/users/gender", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/gender", {
       method: "PUT",
       body: { gender },
     });
   }
 
   function updateEmail(email = "") {
-    return $fetch<Record<string, any>>("/api/users/email", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/email", {
       method: "PUT",
       body: { email },
     });
   }
 
   function updateContact(contact = "") {
-    return $fetch<Record<string, any>>("/api/users/contact", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/contact", {
       method: "PUT",
       body: { contact },
     });
   }
 
   function updateUserFieldById(id = "", field = "", value = "") {
-    return $fetch<Record<string, any>>(`/api/users/field/${id}`, {
+    return useNuxtApp().$api<Record<string, any>>(`/api/users/field/${id}`, {
       method: "PATCH",
       body: { field, value },
     });
@@ -61,14 +61,14 @@ export default function useUser() {
     search = "",
     page = 1,
   } = {}) {
-    return $fetch<Record<string, any>>("/api/users", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users", {
       method: "GET",
       query: { status, search, page, type },
     });
   }
 
   function getById(id = "") {
-    return $fetch<Record<string, any>>(`/api/users/id/${id}`, {
+    return useNuxtApp().$api<Record<string, any>>(`/api/users/id/${id}`, {
       method: "GET",
     });
   }
@@ -81,7 +81,7 @@ export default function useUser() {
     referralCode = "",
     type = "",
   } = {}) {
-    return $fetch<Record<string, any>>(`/api/users/invite/${id}`, {
+    return useNuxtApp().$api<Record<string, any>>(`/api/users/invite/${id}`, {
       method: "POST",
       body: { firstName, lastName, password, referralCode, type },
     });
@@ -92,7 +92,7 @@ export default function useUser() {
     newPassword: string;
     confirmPassword: string;
   }) {
-    return $fetch("/api/users/password", {
+    return useNuxtApp().$api("/api/users/password", {
       method: "PATCH",
       body: value,
     });

package/composables/useUtils.ts

@@ -140,7 +140,7 @@ export default function useUtils() {
 
   async function getCountries() {
     try {
-      const countries = await $fetch<Array<Record<string, any>>>(
+      const countries = await useNuxtApp().$api<Array<Record<string, any>>>(
         "https://restcountries.com/v3.1/all?fields=name,currencies,idd",
         { method: "GET" }
       );

package/composables/useVerification.ts

@@ -8,7 +8,7 @@ export default function useUser() {
     app = "",
     org = "",
   } = {}) {
-    return $fetch<Record<string, any>>("/api/verifications", {
+    return useNuxtApp().$api<Record<string, any>>("/api/verifications", {
       method: "GET",
       query: { status, search, page, type, email, app, org },
     });
@@ -20,23 +20,29 @@ export default function useUser() {
     org: string;
     role: string;
   }) {
-    return $fetch<Record<string, any>>("/api/verifications/member", {
+    return useNuxtApp().$api<Record<string, any>>("/api/verifications/member", {
       method: "POST",
       body: value,
     });
   }
 
   function signUp(email: string) {
-    return $fetch<Record<string, any>>("/api/verifications/sign-up", {
-      method: "POST",
-      body: { email },
-    });
+    return useNuxtApp().$api<Record<string, any>>(
+      "/api/verifications/sign-up",
+      {
+        method: "POST",
+        body: { email },
+      }
+    );
   }
 
   function cancelInvite(id: string) {
-    return $fetch<Record<string, any>>(`/api/verifications/invite/id/${id}`, {
-      method: "DELETE",
-    });
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/verifications/invite/id/${id}`,
+      {
+        method: "DELETE",
+      }
+    );
   }
 
   function orgSetupFee(
@@ -44,10 +50,13 @@ export default function useUser() {
       seats: number;
     }
   ) {
-    return $fetch<Record<string, any>>("/api/verifications/org-setup-fee", {
-      method: "POST",
-      body: value,
-    });
+    return useNuxtApp().$api<Record<string, any>>(
+      "/api/verifications/org-setup-fee",
+      {
+        method: "POST",
+        body: value,
+      }
+    );
   }
 
   return {

package/nuxt.config.ts

@@ -15,6 +15,7 @@ export default defineNuxtConfig({
         secure: true,
         maxAge: 30 * 24 * 60 * 60,
       },
+      API_CORE: (process.env.API_CORE as string) ?? "http://localhost:5001",
       APP: (process.env.APP as string) ?? "app",
       APP_NAME: (process.env.APP_NAME as string) ?? "App",
       APP_NAME_ROUTE: (process.env.APP_NAME_ROUTE as string) ?? "index",
@@ -69,8 +70,8 @@ export default defineNuxtConfig({
     "/api/entities/**": { proxy: `${process.env.API_CORE}/api/entities/**` },
     "/api/workflows/**": { proxy: `${process.env.API_CORE}/api/workflows/**` },
     "/api/roles/**": { proxy: `${process.env.API_CORE}/api/roles/**` },
-    "/api/promo-codes/**": {
-      proxy: `${process.env.API_CORE}/api/promo-codes/**`,
+    "/api/promos/**": {
+      proxy: `${process.env.API_CORE}/api/promos/**`,
     },
     "/api/verifications/**": {
       proxy: `${process.env.API_CORE}/api/verifications/**`,

package/package.json

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

package/pages/member-suspended.vue

@@ -21,7 +21,7 @@
           rounded
           @click="navigateTo({ name: 'index' })"
         >
-          Return to Landing Page
+          Return
         </v-btn>
       </v-row>
     </v-col>

package/plugins/API.ts

@@ -1,58 +1,18 @@
-import { useFetch } from "nuxt/app";
-type useFetchType = typeof useFetch;
-
 export default defineNuxtPlugin(() => {
-  const { cookieConfig, BASE_URL } = useRuntimeConfig().public;
+  const { cookieConfig } = useRuntimeConfig().public;
 
   const api = $fetch.create({
-    baseURL: "/",
-    retry: 1,
-    retryStatusCodes: [401],
-    retryDelay: 500,
-    onRequest({ options }) {
-      const accessToken = useCookie("accessToken", cookieConfig).value;
-      options.headers.set("Authorization", `Bearer ${accessToken}`);
-    },
-
-    async onResponseError({ response }) {
-      if (response.status === 401) {
-        await $fetch("/api/auth/refresh", {
-          method: "POST",
-          body: JSON.stringify({
-            token: useCookie("refreshToken", cookieConfig).value,
-          }),
-
-          onResponse({ response }) {
-            if (response.status === 200) {
-              useCookie("accessToken", cookieConfig).value =
-                response._data.token;
-            }
-          },
-        });
-      }
+    baseURL: useRuntimeConfig().public.API_CORE,
+    credentials: "include",
+    headers: {
+      cookie: `domain=${cookieConfig.domain}; Max-Age=${cookieConfig.maxAge}; Secure=${cookieConfig.secure}`,
     },
   });
 
-  const useAPI: useFetchType = (path, options = {}) => {
-    options.lazy = true;
-    options.retry = 1;
-    options.retryStatusCodes = [401];
-    options.retryDelay = 500;
-    options.baseURL = (BASE_URL as string) ?? "/";
-
-    options.headers = {
-      ...options.headers,
-      Authorization: `Bearer ${useCookie("accessToken", cookieConfig).value}`,
-    };
-
-    return useFetch(path, options);
-  };
-
-  // Expose to $fetch
+  // Expose to useNuxtApp().$api
   return {
     provide: {
       api,
-      useAPI,
     },
   };
 });

package/plugins/secure.client.ts

@@ -14,7 +14,9 @@ export default defineNuxtPlugin(() => {
     }
 
     try {
-      currentUser.value = await $fetch<TUser>(`/api/users/id/${user}`);
+      currentUser.value = await useNuxtApp().$api<TUser>(
+        `/api/users/id/${user}`
+      );
     } catch (error) {
       navigateTo({ name: "index" });
     }

package/plugins/vuetify.ts

@@ -33,6 +33,10 @@ export default defineNuxtPlugin((app) => {
         variant: "outlined",
         density: "comfortable",
       },
+      VCombobox: {
+        variant: "outlined",
+        density: "comfortable",
+      },
     },
     theme: {
       defaultTheme: "defaultTheme",

package/types/job-post.d.ts

@@ -0,0 +1,18 @@
+declare type TJobPost = {
+  _id?: ObjectId;
+  org: ObjectId;
+  orgName?: string;
+  title: string;
+  setup: string;
+  location: string;
+  type: string;
+  minSalary?: number;
+  maxSalary?: number;
+  currency?: string;
+  payPeriod?: string;
+  description: string;
+  status?: string;
+  createdAt?: Date;
+  updatedAt?: Date;
+  deletedAt?: Date;
+};

package/types/org.d.ts

@@ -5,6 +5,7 @@ declare type TOrg = {
   email?: string;
   contact?: string;
   createdBy: string;
+  promoCode?: string;
   status?: string;
   createdAt?: string;
   updatedAt?: string;

package/types/promo.d.ts

@@ -0,0 +1,22 @@
+declare type TPromo = {
+  _id?: string;
+  code: string;
+  type: "flat" | "fixed" | "volume";
+  flatRate?: number; // regardless of seats
+  fixedRate?: number; // per seat
+  tiers?: Array<{
+    minSeats: number;
+    maxSeats: number;
+    rate: number;
+  }>;
+  currency: string;
+  startDate?: Date | string;
+  endDate?: Date | string;
+  seats?: number;
+  usage?: number;
+  apps?: string[];
+  status?: "active" | "inactive" | "expired";
+  createdAt?: Date | string;
+  updatedAt?: Date | string;
+  deletedAt?: Date | string;
+};