Skip to content

Commit 9fb06bb

Browse files
lassejacolassejaco
committed
Merge branch 'main' of https://github.com/efdevcon/monorepo 
2 parents 184dbc5 + fca6ced commit 9fb06bb

7 files changed

Lines changed: 51 additions & 60 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ export default function ScheduleTab({ atprotoEvents = [] }: ScheduleTabProps) {
2525
setSelectedDay={setSelectedDay}
2626
events={atprotoEvents.filter((event: any) => event.isCoreEvent)}
2727
/>
28-
<Separator className="my-4 mx-4 w-full" />
28+
{/* <Separator className="my-4 mx-4 w-full" />
2929
<Layout
3030
isCommunityCalendar={true}
3131
selectedEvent={selectedEvent}
3232
selectedDay={selectedDay}
3333
setSelectedEvent={setSelectedEvent}
3434
setSelectedDay={setSelectedDay}
3535
events={atprotoEvents.filter((event: any) => !event.isCoreEvent)}
36-
/>
36+
/> */}
3737
</div>
3838
);
3939
}

‎devconnect-app/src/app/worlds-fair/schedule-tab.module.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
[data-type="action-bar"] {
33
@media (pointer: coarse) {
44
padding-left: 16px;
5+
padding-right: 16px;
56
}
67
}
78
}

‎devconnect/src/pages/api/notion/organization/[id].ts‎

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
8585
return value && typeof value === 'object' && value.type === 'relation';
8686
});
8787

88-
let orgName = '';
88+
const orgName = pageDetails.properties?.['Org']?.title?.[0]?.plain_text || 'Unknown Org';
8989
let subItems: any[] = [];
9090

9191
// Get sub-items from relation properties (excluding Quest)
@@ -96,33 +96,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
9696
continue;
9797
}
9898

99-
// Process Supporters Tracker property first to get orgName
100-
if (propertyName === 'Supporters Tracker') {
101-
const propertyData = property as any;
102-
if (propertyData.relation && propertyData.relation.length > 0) {
103-
console.log(`[API Call] Processing Supporters Tracker for orgName`);
104-
105-
const supporterPageId = propertyData.relation[0].id;
106-
console.log(`[API Call] Supporter Page ID: ${supporterPageId}`);
107-
try {
108-
const supporterPage = await notion.pages.retrieve({ page_id: supporterPageId });
109-
const supporterData = supporterPage as any;
110-
111-
// Extract just the supporter name/title
112-
orgName = supporterData.properties?.['Supporter Name']?.title?.[0]?.plain_text ||
113-
supporterData.properties?.Name?.title?.[0]?.plain_text ||
114-
supporterData.properties?.Title?.title?.[0]?.plain_text ||
115-
'Unknown Supporter';
116-
117-
console.log(`[API Call] Set orgName to: ${orgName}`);
118-
} catch (err) {
119-
console.error(`[API Call] Failed to retrieve Supporters Tracker page ${supporterPageId}:`, err);
120-
orgName = 'Error loading supporter data';
121-
}
122-
}
123-
continue; // Skip further processing for this property
124-
}
125-
12699
// Process Sub-item property with individual page retrievals for detailed data
127100
if (propertyName === 'Sub-item') {
128101
const propertyData = property as any;
@@ -247,16 +220,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
247220
}
248221
}
249222

250-
// console.log(`[API Call] Final result for ${pageId}:`, {
251-
// orgName: orgName,
252-
// totalSubItems: subItems.length,
253-
// subItemsWithData: subItems.filter(item => item.completionPercentage > 0 || item.status !== 'No Status').length
254-
// });
255-
256223
return res.status(200).json({
257224
children: subItems,
258225
count: subItems.length,
259-
orgName: orgName,
226+
orgName,
260227
accreditationGuideUrl: process.env.ACCREDITATION_GUIDE || ''
261228
});
262229
} catch (error) {

‎devconnect/src/pages/form/[name]/[id].tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,6 +1676,7 @@ export default function UpdatePage({ params }: { params?: { name: string; id: st
16761676
>
16771677
<a
16781678
href={`/form/accreditation/${item.id}`}
1679+
target="_blank"
16791680
style={{
16801681
color: '#007bff',
16811682
textDecoration: 'none',

‎lib/components/event-schedule-new/index.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ const NewScheduleIndexInner = ({
317317
<div key={date} className="relative">
318318
{/* Sticky date header */}
319319
<div
320+
data-type="list-day-header"
320321
className={cn(
321322
"sticky top-0 z-[11] w-[calc(100%+2px)] translate-x-[-1px] text-base text-[#3A365E] font-medium py-2 border-solid bg-white cursor-pointer flex items-center justify-between",
322323
!isLast && "border-b border-[rgba(224,224,235,1)]"

‎lib/components/event-schedule-new/layout-app.module.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.layout-app {
2+
[data-type="list-day-header"] {
3+
top: calc(59px + max(0px, env(safe-area-inset-top)));
4+
}
5+
}

‎lib/components/event-schedule-new/layout-app.tsx‎

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import ActionBar from "./action-bar";
44
import { Filter, FilterSummary, useFilters } from "./filter";
55
import filterCss from "./filter.module.scss";
66
import Link from "lib/components/link/Link";
7+
import layoutCss from "./layout-app.module.scss";
8+
import cn from "classnames";
9+
// import TicketPurple from "lib/assets/icons/ticket-purple.svg";
710

811
type CalendarLayoutProps = ScheduleProps & {
912
isCommunityCalendar: boolean;
@@ -24,34 +27,47 @@ const Layout = (props: CalendarLayoutProps) => {
2427
} = useFilters(props.events);
2528

2629
return (
27-
<div className="flex flex-col gap-4 w-full bg-white">
28-
{/* <div className="flex-col md:flex-row flex justify-between gap-4 md:mt-4 md:mb-1 mb-4">
29-
<div className="text-3xl font-secondary shrink-0">
30-
{props.isCommunityCalendar ? (
30+
<div
31+
className={cn(
32+
"flex flex-col gap-4 w-full bg-white",
33+
layoutCss["layout-app"]
34+
)}
35+
>
36+
<div className="flex-col md:flex-row flex justify-between gap-4 md:mt-1 md:mb-1 mb-1 px-4 md:px-0">
37+
<div
38+
className={cn(
39+
"text-sm overflow-hidden px-4 py-2 text-[#36364C] self-center w-full",
40+
props.isCommunityCalendar
41+
? "bg-[#74ACDF33]"
42+
: "bg-[#3A365E] border border-transparent"
43+
)}
44+
style={
45+
!props.isCommunityCalendar
46+
? {
47+
borderImage:
48+
"linear-gradient(137.84deg, #F6B613 12.86%, #FF85A6 40.77%, #9894FF 67.87%, #8855CC 97.26%)",
49+
borderImageSlice: 1,
50+
borderWidth: "1px",
51+
borderStyle: "solid",
52+
}
53+
: undefined
54+
}
55+
>
56+
<div className="flex flex-col text-center md:text-left md:flex-row items-center gap-2 text-white">
57+
{/* <TicketPurple className="h-[26px] w-[26px] mr-2 shrink-0 hidden md:inline-block" /> */}
3158
<div className="flex flex-col">
32-
<b>Community Calendar</b>
33-
<div className="text-base font-secondary">
34-
Events held around Buenos Aires
59+
<div className="font-semibold leading-tight">
60+
These events are hosted inside La Rural and require a Devconnect
61+
World’s Fair ticket to enter.
3562
</div>
36-
</div>
37-
) : (
38-
<div className="flex flex-col">
39-
<b>Devconnect ARG schedule </b>
40-
<div className="text-base font-secondary">
41-
Events held within La Rural (
42-
<Link href="https://tickets.devconnect.org">
43-
ticket required
44-
</Link>
45-
)
63+
<div>
64+
You may also need to sign up or purchase tickets for other
65+
events within the venue.
4666
</div>
4767
</div>
48-
)}
49-
</div>
50-
<div className="text-sm rounded-md bg-[#74ACDF33] px-4 py-2 text-[#36364C] self-center">
51-
This calendar is a work in progress and will change before Devconnect
52-
week. <b>Check back regularly for updates.</b>
68+
</div>
5369
</div>
54-
</div> */}
70+
</div>
5571

5672
<ActionBar
5773
isCommunityCalendar={props.isCommunityCalendar}

0 commit comments

Comments
 (0)