Skip to content

Commit 4b804f0

Browse files
lassejacolassejaco
committed
Merge branch 'main' of github.com:efdevcon/monorepo
2 parents 4bd1605 + d17317e commit 4b804f0

11 files changed

Lines changed: 478 additions & 210 deletions

File tree

‎devconnect-app/eslint.config.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const compat = new FlatCompat({
1010
});
1111

1212
const eslintConfig = [
13-
...compat.extends(['next/core-web-vitals']),
13+
...compat.extends('next/core-web-vitals'),
1414
];
1515

1616
export default eslintConfig;

‎devconnect-app/src/app/dashboard-sections.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export function WelcomeSection() {
2727
</div>
2828
</div>
2929
<div className="text-xl font-bold">{dummyEmail}</div>
30-
<div>Welcome to the Ethereum World's Fair! </div>
30+
<div>Welcome to the Ethereum World&apos;s Fair! </div>
3131
</div>
3232
);
3333
}
@@ -44,7 +44,7 @@ export function TodaysSchedule({ atprotoEvents }: { atprotoEvents: any[] }) {
4444
return (
4545
<div className="flex flex-col items-start justify-start gap-2 p-4 pt-3 bg-white border border-[rgba(234,234,234,1)]">
4646
<div className="flex w-full items-center justify-between gap-2">
47-
<p className="font-semibold">Today's Schedule</p>
47+
<p className="font-semibold">Today&apos;s Schedule</p>
4848
{/* <p className="text-xs">{moment().format('dddd, D MMMM')}</p> */}
4949
</div>
5050
<p className="text-xs mb-2">

‎devconnect-app/src/app/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import HomePageContent from './page-content';
2-
import { getAtprotoEvents } from './worlds-fair/page';
2+
import { getAtprotoEvents } from '@/utils/atproto-events';
33

44
export default async function HomePage() {
55
const atprotoEvents = await getAtprotoEvents();

‎devconnect-app/src/app/schedule/page.tsx‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,5 @@
11
import ProgrammePageContent from './page-content';
2-
import { apiResultToCalendarFormat } from 'lib/components/event-schedule-new/atproto-to-calendar-format';
3-
4-
export async function getAtprotoEvents() {
5-
try {
6-
const atprotoEvents = await fetch(
7-
process.env.NODE_ENV === 'development' && !process.env.FORCE_PROD_ENV
8-
? 'http://localhost:4000/calendar-events'
9-
: 'https://at-slurper.onrender.com/calendar-events',
10-
{
11-
next: { revalidate: 300 }, // Cache for 5 minutes
12-
}
13-
);
14-
15-
const atprotoEventsData = await atprotoEvents.json();
16-
17-
const formattedAtprotoEvents = apiResultToCalendarFormat(atprotoEventsData);
18-
19-
return formattedAtprotoEvents;
20-
} catch (error) {
21-
console.error(error);
22-
return [];
23-
}
24-
}
2+
import { getAtprotoEvents } from '@/utils/atproto-events';
253

264
export default async function ProgrammePage() {
275
const atprotoEvents = await getAtprotoEvents();

‎devconnect-app/src/app/wallet/WalletTab.tsx‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -680,8 +680,8 @@ export default function WalletTab() {
680680
}
681681
}}
682682
>
683-
<div className="flex items-start justify-between">
684-
<div className="flex-1">
683+
<div className="w-full">
684+
<div className="w-full">
685685
{description && (
686686
<p className="font-medium text-sm mb-1 text-[#36364c]">
687687
{description}
@@ -692,26 +692,26 @@ export default function WalletTab() {
692692
{truncateHash(hash)} ↗
693693
</p>
694694
)}
695-
{chainId && (
696-
<div className="flex items-center gap-1 mt-1">
697-
{getNetworkLogo(chainId) && (
698-
<img
699-
src={getNetworkLogo(chainId)}
700-
alt={readableNetwork}
701-
className="w-3 h-3 rounded-full"
702-
/>
703-
)}
704-
<p className="text-xs text-[#4b4b66]">
705-
{readableNetwork}
695+
{chainId && timestamp && (
696+
<div className="flex items-center justify-between mt-1">
697+
<div className="flex items-center gap-1">
698+
{getNetworkLogo(chainId) && (
699+
<img
700+
src={getNetworkLogo(chainId)}
701+
alt={readableNetwork}
702+
className="w-3 h-3 rounded-full"
703+
/>
704+
)}
705+
<p className="text-xs text-[#4b4b66]">
706+
{readableNetwork}
707+
</p>
708+
</div>
709+
<p className="text-xs text-gray-500">
710+
{formatTimestamp(timestamp)}
706711
</p>
707712
</div>
708713
)}
709714
</div>
710-
{timestamp && (
711-
<p className="text-xs text-gray-500 ml-2">
712-
{formatTimestamp(timestamp)}
713-
</p>
714-
)}
715715
</div>
716716
</div>
717717
);

‎devconnect-app/src/app/worlds-fair/page.tsx‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,5 @@
11
import ProgrammePageContent from './page-content';
2-
import { apiResultToCalendarFormat } from 'lib/components/event-schedule-new/atproto-to-calendar-format';
3-
4-
export async function getAtprotoEvents() {
5-
try {
6-
const atprotoEvents = await fetch(
7-
process.env.NODE_ENV === 'development' && !process.env.FORCE_PROD_ENV
8-
? 'http://localhost:4000/calendar-events'
9-
: 'https://at-slurper.onrender.com/calendar-events',
10-
{
11-
next: { revalidate: 300 }, // Cache for 5 minutes
12-
}
13-
);
14-
15-
const atprotoEventsData = await atprotoEvents.json();
16-
17-
const formattedAtprotoEvents = apiResultToCalendarFormat(atprotoEventsData);
18-
19-
return formattedAtprotoEvents;
20-
} catch (error) {
21-
console.error(error);
22-
return [];
23-
}
24-
}
2+
import { getAtprotoEvents } from '@/utils/atproto-events';
253

264
export default async function ProgrammePage() {
275
const atprotoEvents = await getAtprotoEvents();

0 commit comments

Comments
 (0)