Merge branch 'main' of github.com:LabSyncro/LabSyncro into feat/add-device-page

Author: ngyngcphu

.DS_Store

@@ -1,8 +1,13 @@
-DATABASE_USER=admin
-DATABASE_HOST=localhost
-DATABASE_NAME=labsyncro
-DATABASE_PASSWORD=secret
-DATABASE_PORT=5432
-JWT_SECRET=,
-NODE_ENV=,
-DATABASE_URL=postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}
+DATABASE_USER=
+DATABASE_HOST=
+DATABASE_NAME=
+DATABASE_PASSWORD=
+DATABASE_PORT=
+JWT_SECRET=
+NODE_ENV=dev
+DATABASE_URL=
+AUTH_SECRET=
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+PRINT_LABELS_ENDPOINT=
+AUTH_API_BASE_URL=

.env.example

@@ -41,6 +41,7 @@ jobs:
           echo AUTH_SECRET=${{ secrets.AUTH_SECRET }} >> .env
           echo DATABASE_URL=${{ secrets.DATABASE_URL }} >> .env
           echo PRINT_LABELS_ENDPOINT=${{ secrets.PRINT_LABELS_ENDPOINT }} >> .env
+          echo AUTH_API_BASE_URL=${{ secrets.AUTH_API_BASE_URL }} >> .env
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v3

.github/workflows/deploy.yml

@@ -1,14 +1,25 @@
 <script setup lang="ts">
-const { signIn } = useAuth();
+const { signIn, data } = useAuth();
+const router = useRouter();
 
 const handleLogin = async () => {
-  await signIn('google', { callbackUrl: '/' });
+  await signIn('google');
+  if (data.value?.user?.defaultRoute) {
+    router.push(data.value.user.defaultRoute);
+  }
 };
 </script>
 
 <template>
-  <Button class="w-full flex justify-center items-center bg-blue-100 hover:bg-blue-200" @click="handleLogin">
-    <img class="h-5 w-5 mr-2" src="https://www.svgrepo.com/show/475656/google-color.svg" alt="Google logo">
-    Sign in with Google
-  </Button>
-</template>
+  <button
+    @click="handleLogin"
+    class="w-full flex items-center justify-center gap-3 px-4 py-3 border border-gray-300 rounded-lg text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-tertiary-darker transition-colors"
+  >
+    <img 
+      class="h-5 w-5" 
+      src="https://www.svgrepo.com/show/475656/google-color.svg" 
+      alt="Google logo"
+    >
+    <span>Sign in with Google</span>
+  </button>
+</template>

bun.lockb

@@ -1,21 +1,21 @@
 <script setup lang="ts">
 import type { Row } from '@tanstack/vue-table';
 import { MoreHorizontal } from 'lucide-vue-next';
-import { BorrowReturnDeviceSchema, type BorrowReturnDevice } from './schema';
+import { BorrowDeviceSchema, type BorrowDevice } from './schema';
 import { Value } from '@sinclair/typebox/value';
 
 interface DataTableRowActionsProps {
-  row: Row<BorrowReturnDevice>
+  row: Row<BorrowDevice>
 }
 const props = defineProps<DataTableRowActionsProps>();
 
 computed(() => {
   const data = props.row.original;
 
-  if (Value.Check(BorrowReturnDeviceSchema, data)) {
-    return data as BorrowReturnDevice;
+  if (Value.Check(BorrowDeviceSchema, data)) {
+    return data as BorrowDevice;
   } else {
-    throw new Error('Invalid Borrow Return Table Data Schema');
+    throw new Error('Invalid Borrow Table Data Schema');
   }
 });
 </script>

components/app/Auth/LoginButton.vue

@@ -1,4 +1,4 @@
-import type { BorrowReturnDevice } from './schema';
+import type { BorrowDevice } from './schema';
 import { formatDate } from '~/lib/utils';
 import type { AugmentedColumnDef } from '~/components/common/DataTable/column';
 
@@ -7,7 +7,7 @@ const statusMap = {
   on_time: 'Đúng hạn',
 };
 
-export const columns: AugmentedColumnDef<BorrowReturnDevice>[] = [
+export const columns: AugmentedColumnDef<BorrowDevice>[] = [
   {
     id: 'name',
     title: 'Tên thiết bị',

…pp/BorrowReturnDeviceTable/RowAction.vue …ents/app/BorrowDeviceTable/RowAction.vuecomponents/app/BorrowReturnDeviceTable/RowAction.vue renamed to components/app/BorrowDeviceTable/RowAction.vue components/app/BorrowReturnDeviceTable/RowAction.vue renamed to components/app/BorrowDeviceTable/RowAction.vue

@@ -0,0 +1,22 @@
+<script setup lang="ts">
+import { receiptService } from '~/services';
+import { columns } from './column';
+import type { AugmentedColumnDef } from '~/components/common/DataTable/column';
+
+async function fetchData(offset: number, length: number, options: { desc?: boolean, sortField?: string, searchText?: string, searchFields?: string[] }): Promise<{ data: unknown[], totalPages: number }> {
+  const res = await receiptService.getBorrowReceipts(offset, length, { searchText: options.searchText, searchFields: ['device_kind_id', 'device_kind_name', 'borrowed_place', 'returned_place'], sortField: options.sortField as any, desc: options.desc });
+  return {
+    data: res.receipts.map((receipt) => ({
+      ...receipt,
+      image: receipt.mainImage
+    })),
+    totalPages: res.totalPages,
+  };
+}
+
+</script>
+
+<template>
+  <DataTable :selectable="true" :searchable="true" :qrable="true" :fetch-fn="fetchData"
+    :columns="columns as AugmentedColumnDef<unknown>[]" />
+</template>

…/app/BorrowReturnDeviceTable/Toolbar.vue …onents/app/BorrowDeviceTable/Toolbar.vuecomponents/app/BorrowReturnDeviceTable/Toolbar.vue renamed to components/app/BorrowDeviceTable/Toolbar.vue components/app/BorrowReturnDeviceTable/Toolbar.vue renamed to components/app/BorrowDeviceTable/Toolbar.vue

@@ -1,7 +1,7 @@
 import { Type } from '@sinclair/typebox';
 import type { Static } from '@sinclair/typebox';
 
-export const BorrowReturnDeviceSchema = Type.Object({
+export const BorrowDeviceSchema = Type.Object({
   id: Type.Number(),
   name: Type.String(),
   image: Type.String(),
@@ -13,4 +13,4 @@ export const BorrowReturnDeviceSchema = Type.Object({
   status: Type.Union([Type.Literal('on_time'), Type.Literal('late')]),
 });
 
-export type BorrowReturnDevice = Static<typeof BorrowReturnDeviceSchema>;
+export type BorrowDevice = Static<typeof BorrowDeviceSchema>;