fixed logs

Author: codermehraj

client/components/dataTables/ContractorLogs.tsx

@@ -88,6 +88,26 @@ export const columns: ColumnDef<ContractorLog>[] = [
       <div className="text-center font-medium">{row.getValue("description")}</div>
     ),
   },
+  {
+    accessorKey: "time",
+    header: ({ column }) => {
+      return (
+        <div className="flex justify-center items-center">
+          <Button
+            variant="ghost"
+            className="text-center"
+            onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
+          >
+            Time
+            <CaretSortIcon className="ml-2 h-4 w-4" />
+          </Button>
+        </div>
+      );
+    },
+    cell: ({ row }) => (
+      <div className="text-center font-medium">{row.getValue("time")}</div>
+    ),
+  },
   {
     id: "actions",
     enableHiding: false,

client/hooks/dataQuery/useGetAllLogs.tsx

@@ -22,6 +22,13 @@ export default function useGetAllLogs() {
         return {
           type: log.type,
           description: log.description,
+          time: new Date(log.createdAt).toLocaleString(
+            "en-US",
+            {              
+              hour: "2-digit",
+              minute: "2-digit",             
+            }
+          ),
         };
       });
       await setContractorLog(logList);

server/src/controllers/logs.ts

@@ -8,7 +8,11 @@ const prisma = new PrismaClient();
 
 const getAdminLogs = errorWrapper(
   async (req: Request, res: Response) => {
-    const logs = await prisma.adminLogs.findMany();
+    const logs = await prisma.adminLogs.findMany({
+      orderBy:{
+        createdAt : 'desc'
+      }
+    });
     res.status(200).json(logs);
   },
   { statusCode: 500, message: "Couldn't get admin logs" }

server/src/index.ts

@@ -7,6 +7,10 @@ import cors from "cors";
 import { createServer } from "http";
 import { Server } from "socket.io";
 import { track } from "./controllers/tracking";
+import { getIPAddress } from "./services/utils";
+
+
+getIPAddress();
 
 const PORT = process.env.PORT || 3000;
 const app = express();

server/src/services/utils.ts

@@ -1,3 +1,5 @@
+import * as os from 'os';
+
 const randomOTPGenerator = () => {
   const otp = Math.floor(1000 + Math.random() * 9000);
   return otp;
@@ -8,4 +10,27 @@ const randomPasswordGenerator = () => {
   return password;
 };
 
-export { randomOTPGenerator, randomPasswordGenerator };
+
+const getIPAddress = (): string => {
+  // Get the network interfaces
+  const networkInterfaces = os.networkInterfaces();
+
+  // Extract the IPv4 address from the network interfaces
+  const ipv4Addresses: string[] = [];
+  for (const interfaceName in networkInterfaces) {
+    if (Object.prototype.hasOwnProperty.call(networkInterfaces, interfaceName)) {
+      const interfaces = networkInterfaces[interfaceName];
+      for (const iface of interfaces?.filter(Boolean) || []){
+        if (iface.family === 'IPv4' && !iface.internal) {
+          ipv4Addresses.push(iface.address);
+        }
+      }
+    }
+  }
+
+  console.log('IPv4 Addresses:', ipv4Addresses[0]);
+  return ipv4Addresses[0] || '';
+};
+
+
+export { randomOTPGenerator, randomPasswordGenerator, getIPAddress };