Skip to content

Commit 0c67a31

Browse files
authored
Various bug fixes (#230)
* fix: moved mobile nav menu up by a few pixels * fix: event location text breaks on mobile * fix: fixed a bug where background star in contact form was overflowing
1 parent 75466dd commit 0c67a31

5 files changed

Lines changed: 42 additions & 42 deletions

File tree

src/app/(frontend)/contact/_components/ContactForm.tsx

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,6 @@ export default function ContactForm() {
5252

5353
return (
5454
<div className="text-center text-primary-white flex flex-col items-center w-full">
55-
{/* Background star */}
56-
<div className="absolute bottom-0 -right-50 -z-10 overflow-hidden">
57-
<Image
58-
src="/images/signup/background_star.png"
59-
alt="background star red"
60-
width={700}
61-
height={700}
62-
className="w-[650px]"
63-
/>
64-
</div>
65-
6655
<h3 className="underline underline-offset-4 mb-2">Let’s have a chat!</h3>
6756
<p className="mb-6 max-w-[60%]">
6857
We’d love to hear from you! You can contact us with the form below or send us an

src/app/(frontend)/contact/page.tsx

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import ContactForm from '@/app/(frontend)/contact/_components/ContactForm';
33

44
export default function ContactPage() {
55
return (
6-
<section className="flex justify-center lg:px-[13%] md:px-[10%] px-[6%] h-full py-28 w-full">
6+
<section className="relative flex justify-center lg:px-[13%] md:px-[10%] px-[6%] h-full py-28 w-full">
77
<div className="flex flex-col md:flex-row items-stretch xl:items-center w-full">
88
<div className="mb-8 md:mb-0 md:mr-8 flex-1 flex md:w-[38%] lg:w-[40%] w-full">
99
<Image
@@ -17,10 +17,19 @@ export default function ContactPage() {
1717
priority
1818
/>
1919
</div>
20-
<div className="w-full md:w-[62%] lg:w-[60%]">
20+
<div className="w-full md:w-[62%] lg:w-[60%] overflow-hidden">
2121
<ContactForm />
2222
</div>
2323
</div>
24+
{/* Background star */}
25+
<div className="absolute -bottom-50 -right-70 -z-10">
26+
<Image
27+
src="/images/signup/background_star.png"
28+
alt="background star red"
29+
width={700}
30+
height={700}
31+
/>
32+
</div>
2433
</section>
2534
);
2635
}

src/components/navigation/Navbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export default function Navbar() {
9797
animate={{ x: 1 }}
9898
exit={{ x: -150 }}
9999
transition={{ duration: 0.1 }}
100-
className="absolute -top-[7px] -left-[1px] mt-2 w-40 rounded-lg bg-primary-grey-light z-40"
100+
className="absolute -top-[8px] -left-[1px] mt-2 w-40 rounded-lg bg-primary-grey-light z-40"
101101
>
102102
<div className="flex flex-col pt-18 pb-4 px-5 space-y-3 font-roboto-mono text-primary-white">
103103
{links.map((link) => (

src/features/events/components/EventCard.tsx

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -117,35 +117,35 @@ export default function EventCard({
117117
{!event.locked ? event.title : 'Locked Event'}
118118
</h4>
119119
<div className="flex justify-between gap-x-5">
120-
<div className="relative w-[185px] md:w-full h-[231px] md:h-[520px] rounded-3xl overflow-hidden shadow-lg">
121-
<Image
122-
src={event.image}
123-
alt={event.imageAlt}
124-
fill
125-
priority
126-
className={`object-cover ${event.locked ? 'blur-sm' : ''}`}
127-
draggable={false}
128-
/>
129-
{event.locked && (
120+
<div className="relative aspect-[3/4] w-[185px] md:w-80 shrink-0 rounded-3xl overflow-hidden shadow-lg">
130121
<Image
131-
src="/images/home/lock.png"
132-
alt="Locked"
133-
width={80}
134-
height={80}
122+
src={event.image}
123+
alt={event.imageAlt}
124+
fill
125+
priority
126+
className={`object-cover ${event.locked ? 'blur-sm' : ''}`}
135127
draggable={false}
136-
className="absolute inset-0 m-auto z-10"
137128
/>
138-
)}
129+
{event.locked && (
130+
<Image
131+
src="/images/home/lock.png"
132+
alt="Locked"
133+
width={80}
134+
height={80}
135+
draggable={false}
136+
className="absolute inset-0 m-auto z-10"
137+
/>
138+
)}
139+
</div>
140+
<EventInfo
141+
event={event}
142+
dateString={dateString}
143+
className="md:hidden"
144+
/>
139145
</div>
140-
<EventInfo
141-
event={event}
142-
dateString={dateString}
143-
className="md:hidden"
144-
/>
145-
</div>
146146

147-
{/* Right panel matches image height */}
148-
<div className="flex flex-col w-full h-full md:h-[520px] rounded-3xl !bg-transparent !border-none">
147+
{/* Right panel matches image height */}
148+
<div className="flex flex-col w-full h-full md:h-[520px] rounded-3xl !bg-transparent !border-none">
149149
<div>
150150
<div className="hidden md:flex justify-between items-center">
151151
<h4 className="font-bold leading-tight">
@@ -191,14 +191,14 @@ export default function EventCard({
191191
<div
192192
className={`mt-3 md:justify-end ${even ? 'justify-end' : 'justify-start'} flex`}
193193
style={{ display: isSeeMoreVisible ? 'flex' : 'none' }}
194-
>
194+
>
195195
<Button
196196
variant="clear"
197197
size="sm"
198198
className="flex justify-center gap-3 px-4 py-2 whitespace-nowrap bg-primary-grey/80"
199199
onClick={() => setExpanded(!expanded)}
200200
aria-expanded={expanded}
201-
>
201+
>
202202
{expanded ? 'See less' : 'See more'}
203203
{expanded ? <ChevronUp strokeWidth={2.5} /> : <ChevronDown strokeWidth={2.5} />}
204204
</Button>

src/features/events/components/EventInfo.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ export default function EventInfo({ event, className, dateString }: { event: Eve
2626
<span className="flex flex-row items-center whitespace-nowrap">
2727
<DollarSign /> {event.nonMemberPrice} (Non-Members)
2828
</span>
29-
<span className="flex flex-row items-center whitespace-nowrap">
30-
<MapPin className="mr-1" />
29+
<span className="flex items-start">
30+
<MapPin className="mt-0.5 mr-1 shrink-0"/>
31+
<span className="break-words">
3132
{event.location}
33+
</span>
3234
</span>
3335
</div>
3436
</div>

0 commit comments

Comments
 (0)