Skip to content

Global Error Boundary, 404 Page, Loading Skeletons & Toast System Standardization #1043

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

Merged
mftee merged 2 commits into from
Jun 27, 2026
Merged

Global Error Boundary, 404 Page, Loading Skeletons & Toast System Standardization #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3781b71
fix errors
MercyDuru Jun 25, 2026
5a38f2a
Merge branch 'main' into fe-30
mftee Jun 27, 2026
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: 4 additions & 1 deletion backend/src/auth/two-factor.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import {
UnauthorizedException,
} from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { generateSecret, verify, generateURI } from 'otplib';
import { Repository, IsNull } from 'typeorm';
import { TOTP, generateURI } from 'otplib';
// import { authenticator } from 'otplib';
Expand All @@ -13,6 +15,7 @@ import * as bcrypt from 'bcrypt';
import { Redis } from 'ioredis';
import { User } from '../users/entities/user.entity';
import { TwoFactorRecovery } from '../users/entities/two-factor-recovery.entity';
import { IsNull } from 'typeorm';

const authenticator = new TOTP();

Expand All @@ -33,7 +36,7 @@ export class TwoFactorService {
}

async initiateSetup(userId: number, email: string) {
const secret = authenticator.generateSecret();
const secret = generateSecret();
const appName = 'YieldLadder platform';
const otpauthUrl = generateURI({ secret, issuer: appName, label: email });
const qrCodeDataUrl = await qrcode.toDataURL(otpauthUrl);
Expand Down
3 changes: 3 additions & 0 deletions backend/src/shipments/shipments.analytics.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ function makeUser(overrides: Partial<User> = {}): User {
verificationTokenExpiry: null,
resetPasswordToken: null,
resetPasswordExpiry: null,
isTwoFactorEnabled: false,
twoFactorSecret: '',
recoveryCodes: [],
createdAt: new Date(),
updatedAt: new Date(),
isTwoFactorEnabled: false,
Expand Down
Loading