Skip to content

Commit

Permalink
(fix) : few minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
vigneshshettyin committed Jan 16, 2025
1 parent 43d36b4 commit 17b2bcc
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 41 deletions.
48 changes: 12 additions & 36 deletions app/app/(dashboard)/links/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,37 +62,6 @@ export default function Page({
return parseInt(decodedStr, 10);
}

const [link, setLink] = useState({
devices: {
Desktop: 720,
Mobile: 420,
Tablet: 60,
},
os: {
windows10: 100,
windows11: 48,
macOS: 50,
},
browser: {
chrome: 45,
firefox: 50,
safari: 70,
},
city: {
"New York": 100,
"Los Angeles": 50,
Chicago: 40,
Houston: 30,
},
locations: [
{ id: 1, country: "United States", engagements: 600, percentage: 50 },
{ id: 2, country: "United Kingdom", engagements: 300, percentage: 25 },
{ id: 3, country: "Canada", engagements: 180, percentage: 15 },
{ id: 4, country: "Australia", engagements: 120, percentage: 10 },
],
});

const [NoDataSet, setNoDataSet] = useState(Object.keys(link.devices).length);

const [fetchLink, setfetchLink] = useState<linkType>({
id: 1,
Expand Down Expand Up @@ -140,6 +109,13 @@ export default function Page({

const router = useRouter();

const [loading, setLoading] = useState(false);
const REDIRECT_URL: string = process.env.REDIRECT_URL || "https://eurl.dev";
const [title, setTitle] = useState<string | null>(fetchLink.title);
const [shortCode, setShortcode] = useState<string>(fetchLink.short_code);
const [NoDataSet, setNoDataSet] = useState<number>(0);
const shortLink: string = `${REDIRECT_URL}/${shortCode}`;

useEffect(() => {
setLoading(true);
getLinkDetailsWithAnalytics(decodeId(params.id).toString()).then((res) => {
Expand All @@ -149,11 +125,11 @@ export default function Page({
});
}, [router, params.id]);

const [loading, setLoading] = useState(false);
const REDIRECT_URL: string = process.env.REDIRECT_URL || "https://eurl.dev";
const [title, setTitle] = useState<string | null>(fetchLink.title);
const [shortCode, setShortcode] = useState<string>(fetchLink.short_code);
const shortLink: string = `${REDIRECT_URL}/${shortCode}`;
useEffect(() => {
setShortcode(fetchLink.short_code);
setTitle(fetchLink.title);
headerAnalytics.devices.length == 0 ? setNoDataSet(1) : setNoDataSet(0);
}, [fetchLink, headerAnalytics]);

if (loading) {
return <LinkPageLoading />;
Expand Down
15 changes: 13 additions & 2 deletions lib/services/pgSingelton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ class PrismaClientManager {
private prismaClient: PrismaClient;

private constructor() {
this.prismaClient = new PrismaClient();
// Use an existing global PrismaClient instance if available, otherwise create a new one
if (!global.prismaClient) {
global.prismaClient = new PrismaClient();
}
this.prismaClient = global.prismaClient;
}

public static getInstance(): PrismaClientManager {
Expand All @@ -23,6 +27,7 @@ class PrismaClientManager {
try {
return await this.prismaClient.$queryRaw`SELECT 'OK!' as result`;
} catch (e) {
console.error("Prisma checkStatus error:", e);
return false;
}
}
Expand All @@ -32,4 +37,10 @@ class PrismaClientManager {
}
}

export default PrismaClientManager;
export default PrismaClientManager;

// Declare a global variable for PrismaClient to persist across reloads
declare global {
// eslint-disable-next-line no-var
var prismaClient: PrismaClient | undefined;
}
3 changes: 1 addition & 2 deletions lib/validations/url_create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ import { urlSchema } from "../zod/url";
const validateURLCreateReq = async (formdata: FormData) => {
try {
const long_url = formdata.get("longUrl");
let title:any = "New Link";
const title = formdata.get("title") || "New Link";

// validation of title need to be done
const errors = urlSchema.safeParse({
long_url,
});
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"scripts": {
"dev": "next dev",
"build": "npm run prisma:generate && rimraf pg-worker && next build",
"build": "rimraf pg-worker && next build",
"start": "next start",
"lint": "next lint",
"prisma:generate": "npx prisma generate"
Expand Down

0 comments on commit 17b2bcc

Please sign in to comment.