Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove duplicate checkin #210

Merged
merged 8 commits into from
Aug 3, 2024
Merged

remove duplicate checkin #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
df74644
fix: route protect cannot register
TeeGoood Aug 2, 2024
e4b515b
Merge branch 'main' into tee/fix-route-protect-cannot-register
TeeGoood Aug 2, 2024
b6ba4b4
Merge pull request #208 from isd-sgcu/tee/fix-route-protect-cannot-re…
TeeGoood Aug 2, 2024
459f6e9
fix
TeeGoood Aug 3, 2024
e746858
Merge branch 'main' into remove-duplicate-checkin
TeeGoood Aug 3, 2024
cee431e
lint fix
TeeGoood Aug 3, 2024
b54967a
Merge branch 'remove-duplicate-checkin' of github.com:isd-sgcu/rpkm-f…
TeeGoood Aug 3, 2024
88dc77c
Merge pull request #209 from isd-sgcu/remove-duplicate-checkin
TeeGoood Aug 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/components/rpkm/staff/home/qrscanner/QRScanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import ConfirmationModal from './confirmationModal';
import FailureModal from './failureModal';
import { createCheckIn } from '@/utils/checkin';
import { CheckIn } from '@/types/checkIn';
import dayjs from 'dayjs';
import { getCurrentTime } from '@/utils/time';

const Scan: React.FC = () => {
Expand Down Expand Up @@ -61,7 +60,7 @@ const Scan: React.FC = () => {
localStorage.setItem('enable', 'false');

if (newCheckInData) {
if (newCheckInData.checkIn.isDuplicate) {
/* if (newCheckInData.checkIn.isDuplicate) {
const date = dayjs(newCheckInData.checkIn.timestamp);
setStatus('error');
setError(
Expand All @@ -74,7 +73,7 @@ const Scan: React.FC = () => {
setErrorTopic('Already taken!');
setTaken(true);
return;
}
} */

setCheckInData(newCheckInData);
setStatus('success');
Expand Down
7 changes: 0 additions & 7 deletions src/context/AuthContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,6 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({
if (!isStaffPage) {
return router.push(homePage);
}

if (
(isRpkm && !path.includes('rpkm')) ||
(!isRpkm && !path.includes('firstdate'))
) {
return router.push(homePage);
}
} else {
// user route protection
if (path == '/') {
Expand Down
Loading