Skip to content

Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️

Modify colors, add in-progress

Graham Blaireef565796836
diff --git a/frontend/src/components/common/AttendeeCheckInTable/QrScanner.module.scss b/frontend/src/components/common/AttendeeCheckInTable/QrScanner.module.scss
index 189811d67..3cb3e6faf 100644
--- a/frontend/src/components/common/AttendeeCheckInTable/QrScanner.module.scss
+++ b/frontend/src/components/common/AttendeeCheckInTable/QrScanner.module.scss
@@ -62,7 +62,7 @@
position: absolute;
animation: colorfulBorder 10s infinite;
border-radius: 10px;
- outline: solid 50vmax #472e7840;
+ outline: solid 50vmax rgb(71 46 120 / 50%);
transition: outline-color .2s ease-out;
min-width: 200px;
min-height: 200px;
@@ -74,13 +74,15 @@
}
.scannerOverlay.success {
- outline: solid 50vmax rgb(72 193 72 / 50%);
-
+ outline: solid 50vmax rgb(80 148 80 / 75%);
}
.scannerOverlay.failure {
- outline: solid 50vmax rgb(193 72 72 / 50%);
-
+ outline: solid 50vmax rgb(193 72 72 / 75%);
+ }
+
+ .scannerOverlay.checkingIn {
+ outline: solid 50vmax rgb(172 158 85 / 60%);
}
video {
diff --git a/frontend/src/components/common/AttendeeCheckInTable/QrScanner.tsx b/frontend/src/components/common/AttendeeCheckInTable/QrScanner.tsx
index a5251035e..12f5fddbe 100644
--- a/frontend/src/components/common/AttendeeCheckInTable/QrScanner.tsx
+++ b/frontend/src/components/common/AttendeeCheckInTable/QrScanner.tsx
@@ -25,7 +25,7 @@ export const QRScannerComponent = (props: QRScannerComponentProps) => {
const latestProcessedAttendeeIdsRef = useRef<string[]>([]);
const [currentAttendeeId, setCurrentAttendeeId] = useState<string | null>(null);
- const [debouncedAttendeeId] = useDebouncedValue(currentAttendeeId, 500);
+ const [debouncedAttendeeId] = useDebouncedValue(currentAttendeeId, 1000);
const [isScanFailed, setIsScanFailed] = useState(false);
const [isScanSucceeded, setIsScanSucceeded] = useState(false);
@@ -56,12 +56,19 @@ export const QRScannerComponent = (props: QRScannerComponentProps) => {
const latestProcessedAttendeeIds = latestProcessedAttendeeIdsRef.current;
const alreadyScanned = latestProcessedAttendeeIds.includes(debouncedAttendeeId);
+ if (isScanSucceeded || isScanFailed) {
+ // wait for the full succeed/fail outline transition to complete
+ return;
+ }
+
if (alreadyScanned) {
showError(t`You already scanned this ticket`);
+
setIsScanFailed(true);
setInterval(function() {
setIsScanFailed(false);
- }, 1000);
+ }, 500);
+
return;
}
@@ -72,18 +79,16 @@ export const QRScannerComponent = (props: QRScannerComponentProps) => {
setProcessedAttendeeIds(prevIds => [...prevIds, debouncedAttendeeId]);
setCurrentAttendeeId(null);
- console.log(`Did it succeed? ${didSucceed}`)
- console.log(this);
if (didSucceed) {
setIsScanSucceeded(true);
setInterval(function() {
setIsScanSucceeded(false);
- }, 1000);
+ }, 500);
} else {
setIsScanFailed(true);
setInterval(function() {
setIsScanFailed(false);
- }, 1000);
+ }, 500);
}
}, () => {
setIsCheckingIn(false);
@@ -198,7 +203,7 @@ export const QRScannerComponent = (props: QRScannerComponentProps) => {
</Menu.Dropdown>
</Menu>
</Button>
- <div className={`${classes.scannerOverlay} ${isScanSucceeded ? classes.success : ""} ${isScanFailed ? classes.failure : ""}`}/>
+ <div className={`${classes.scannerOverlay} ${isScanSucceeded ? classes.success : ""} ${isScanFailed ? classes.failure : ""} ${isCheckingIn ? classes.checkingIn : ""}`}/>
</div>
);
};
diff --git a/frontend/src/components/layouts/CheckIn/index.tsx b/frontend/src/components/layouts/CheckIn/index.tsx
index c932b8fa4..cad154968 100644
--- a/frontend/src/components/layouts/CheckIn/index.tsx
+++ b/frontend/src/components/layouts/CheckIn/index.tsx
@@ -100,7 +100,7 @@ const CheckIn = () => {
)
}
- const handleQrCheckIn = (attendeePublicId: string, onRequestComplete: (didSucceed: void) => void, onFailure: () => void) => {
+ const handleQrCheckIn = (attendeePublicId: string, onRequestComplete: (didSucceed: bool) => void, onFailure: () => void) => {
checkInMutation.mutate({
checkInListShortId: checkInListShortId,
attendeePublicId: attendeePublicId,