From 9c685d09b0a76fb538dbc102b33e57ba3086e7be Mon Sep 17 00:00:00 2001
From: Subramani E <mdl21ec119@mec.ac.in>
Date: Mon, 2 Dec 2024 13:47:35 +0530
Subject: [PATCH] resolved dependency issues with react-qr-reader

---
 apps/web-admin/package.json                   |  1 -
 apps/web-admin/src/components/Scanner.jsx     | 23 +++++---
 .../participants/check-in/out/index.jsx       |  2 +-
 pnpm-lock.yaml                                | 59 -------------------
 4 files changed, 15 insertions(+), 70 deletions(-)

diff --git a/apps/web-admin/package.json b/apps/web-admin/package.json
index 85c078c7..508829e0 100644
--- a/apps/web-admin/package.json
+++ b/apps/web-admin/package.json
@@ -53,7 +53,6 @@
     "react-icons": "^5.0.1",
     "react-konva": "^18.2.10",
     "react-markdown": "^9.0.1",
-    "react-qr-reader": "3.0.0-beta-1",
     "react-query": "^3.39.3",
     "react-remove-scroll": "^2.6.0",
     "react-simplemde-editor": "^5.2.0",
diff --git a/apps/web-admin/src/components/Scanner.jsx b/apps/web-admin/src/components/Scanner.jsx
index 499032c9..18cd57aa 100644
--- a/apps/web-admin/src/components/Scanner.jsx
+++ b/apps/web-admin/src/components/Scanner.jsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
-import { QrReader } from 'react-qr-reader';
 import { Box } from '@chakra-ui/react';
+import { useZxing } from 'react-zxing';
 
 const Scanner = ({ result, setResult }) => {
   const handleScan = (result) => {
@@ -12,15 +12,20 @@ const Scanner = ({ result, setResult }) => {
   const handleError = (err) => {
     console.error(err);
   };
-
+  const { ref } = useZxing({
+    onDecodeResult(result) {
+      setResult(result.getText());
+    },
+  });
   return (
-    <QrReader
-      height="100%"
-      width="100%"
-      constraints={{ facingMode: 'environment' }}
-      onResult={handleScan}
-      onError={handleError}
-    />
+    // <QrReader
+    //   height="100%"
+    //   width="100%"
+    //   constraints={{ facingMode: 'environment' }}
+    //   onResult={handleScan}
+    //   onError={handleError}
+    // />
+    <video ref={ref} style={{ height: '100%', width: '100%' }} onError={handleError} />
   );
 };
 
diff --git a/apps/web-admin/src/pages/[orgId]/events/[eventId]/participants/check-in/out/index.jsx b/apps/web-admin/src/pages/[orgId]/events/[eventId]/participants/check-in/out/index.jsx
index 1a24315f..4f6e1eb9 100644
--- a/apps/web-admin/src/pages/[orgId]/events/[eventId]/participants/check-in/out/index.jsx
+++ b/apps/web-admin/src/pages/[orgId]/events/[eventId]/participants/check-in/out/index.jsx
@@ -168,7 +168,7 @@ export default function CheckOutParticipant() {
         </FormControl>
 
         <Button type="submit" width="100%" my="4" isLoading={loading} loadingText="Please Wait">
-          Check In
+          Check Out
         </Button>
       </form>
     </DashboardLayout>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 65fc875d..e630c27c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -560,9 +560,6 @@ importers:
       react-markdown:
         specifier: ^9.0.1
         version: 9.0.1(@types/react@18.3.4)(react@18.3.1)
-      react-qr-reader:
-        specifier: 3.0.0-beta-1
-        version: 3.0.0-beta-1(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       react-query:
         specifier: ^3.39.3
         version: 3.39.3(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
@@ -3081,21 +3078,6 @@ packages:
         integrity: sha512-dbLksz7FEwyFoANbpIlNnd3bVm0clQSUsnP8yUVQucStZPsuWjCrhL2jlAbGNrTrahX96ntUMXHb/sM68TibFg==,
       }
 
-  '@zxing/browser@0.0.7':
-    resolution:
-      {
-        integrity: sha512-AepzMgDnD6EjxewqmXpHJsi4S3Gw9ilZJLIbTf6fWuWySEcHBodnGu3p7FWlgq1Sd5QyfPhTum5z3CBkkhMVng==,
-      }
-    peerDependencies:
-      '@zxing/library': ^0.18.3
-
-  '@zxing/library@0.18.6':
-    resolution:
-      {
-        integrity: sha512-bulZ9JHoLFd9W36pi+7e7DnEYNJhljYjZ1UTsKPOoLMU3qtC+REHITeCRNx40zTRJZx18W5TBRXt5pq2Uopjsw==,
-      }
-    engines: { node: '>= 10.4.0' }
-
   '@zxing/library@0.20.0':
     resolution:
       {
@@ -8773,15 +8755,6 @@ packages:
       '@types/react': '>=18'
       react: '>=18'
 
-  react-qr-reader@3.0.0-beta-1:
-    resolution:
-      {
-        integrity: sha512-5HeFH9x/BlziRYQYGK2AeWS9WiKYZtGGMs9DXy3bcySTX3C9UJL9EwcPnWw8vlf7JP4FcrAlr1SnZ5nsWLQGyw==,
-      }
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0
-      react-dom: ^16.8.0 || ^17.0.0
-
   react-query@3.39.3:
     resolution:
       {
@@ -9249,14 +9222,6 @@ packages:
       }
     hasBin: true
 
-  rollup@2.79.2:
-    resolution:
-      {
-        integrity: sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==,
-      }
-    engines: { node: '>=10.0.0' }
-    hasBin: true
-
   rollup@4.27.4:
     resolution:
       {
@@ -12812,18 +12777,6 @@ snapshots:
     dependencies:
       '@zag-js/dom-query': 0.31.1
 
-  '@zxing/browser@0.0.7(@zxing/library@0.18.6)':
-    dependencies:
-      '@zxing/library': 0.18.6
-    optionalDependencies:
-      '@zxing/text-encoding': 0.9.0
-
-  '@zxing/library@0.18.6':
-    dependencies:
-      ts-custom-error: 3.3.1
-    optionalDependencies:
-      '@zxing/text-encoding': 0.9.0
-
   '@zxing/library@0.20.0':
     dependencies:
       ts-custom-error: 3.3.1
@@ -16889,14 +16842,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  react-qr-reader@3.0.0-beta-1(react-dom@18.2.0(react@18.3.1))(react@18.3.1):
-    dependencies:
-      '@zxing/browser': 0.0.7(@zxing/library@0.18.6)
-      '@zxing/library': 0.18.6
-      react: 18.3.1
-      react-dom: 18.2.0(react@18.3.1)
-      rollup: 2.79.2
-
   react-query@3.39.3(react-dom@18.2.0(react@18.3.1))(react@18.3.1):
     dependencies:
       '@babel/runtime': 7.26.0
@@ -17270,10 +17215,6 @@ snapshots:
     dependencies:
       glob: 10.4.5
 
-  rollup@2.79.2:
-    optionalDependencies:
-      fsevents: 2.3.3
-
   rollup@4.27.4:
     dependencies:
       '@types/estree': 1.0.6